diff --git a/libp2p_storage_mix_transport.nimble b/libp2p_storage_mix_transport.nimble index da7ea8e..9afd206 100644 --- a/libp2p_storage_mix_transport.nimble +++ b/libp2p_storage_mix_transport.nimble @@ -7,7 +7,7 @@ entryPoints = @["mix_ping_tcp.nim", "mix_ping_quic.nim"] requires "nim >= 2.0.0" requires "libp2p == 1.15.3" -requires "https://github.com/logos-co/nim-libp2p-mix.git#feat/mix-read-behavior" +requires "https://github.com/logos-co/nim-libp2p-mix.git#mix-read-behavior-option-1" requires "chronicles >= 0.11.0" requires "chronos >= 4.2.2" requires "results >= 0.5.0" diff --git a/mix_ping_quic.nim b/mix_ping_quic.nim index 7dd99cf..d2ac413 100644 --- a/mix_ping_quic.nim +++ b/mix_ping_quic.nim @@ -103,8 +103,6 @@ proc mixPingSimulation() {.async: (raises: [Exception]).} = # Populate nodePool with all other nodes' public info proto.nodePool.add(resolvedInfos.includeAllExcept(nodeInfo)) - # Register how to read ping responses (32 bytes exactly) - proto.registerDestReadBehavior(PingCodec, readExactly(32)) switch.mount(proto) mixProtos.add(proto) @@ -133,7 +131,12 @@ proc mixPingSimulation() {.async: (raises: [Exception]).} = .toConnection( MixDestination.init(destNode.peerInfo.peerId, destNode.peerInfo.addrs[0]), PingCodec, - MixParameters(expectReply: Opt.some(true), numSurbs: Opt.some(byte(1))), + MixParameters( + expectReply: Opt.some(true), + numSurbs: Opt.some(byte(1)), + readMethod: Opt.some(ReadExactly), + readLimit: Opt.some(32), + ), ) .expect("could not build connection") diff --git a/mix_ping_tcp.nim b/mix_ping_tcp.nim index 5ec7a33..6ee3fd7 100644 --- a/mix_ping_tcp.nim +++ b/mix_ping_tcp.nim @@ -23,6 +23,8 @@ import libp2p/[ ] import libp2p_mix import libp2p_mix/mix_protocol +import libp2p_mix +import libp2p_mix/mix_protocol const NumMixNodes = 10 @@ -84,8 +86,6 @@ proc mixPingSimulation() {.async: (raises: [Exception]).} = # Populate nodePool with all other nodes' public info proto.nodePool.add(resolvedInfos.includeAllExcept(nodeInfo)) - # Register how to read ping responses (32 bytes exactly) - proto.registerDestReadBehavior(PingCodec, readExactly(32)) switch.mount(proto) mixProtos.add(proto) @@ -113,7 +113,12 @@ proc mixPingSimulation() {.async: (raises: [Exception]).} = .toConnection( MixDestination.init(destNode.peerInfo.peerId, destNode.peerInfo.addrs[0]), PingCodec, - MixParameters(expectReply: Opt.some(true), numSurbs: Opt.some(byte(1))), + MixParameters( + expectReply: Opt.some(true), + numSurbs: Opt.some(byte(1)), + readMethod: Opt.some(ReadExactly), + readLimit: Opt.some(32), + ), ) .expect("could not build connection")