diff --git a/.travis.yml b/.travis.yml index faef01911..ce45fe560 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ install: # install and build go-libp2p-daemon - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh - - bash build_p2pd.sh p2pdCache v0.2.4 + - bash build_p2pd.sh p2pdCache update script: - nimble install -y --depsOnly diff --git a/libp2p/protocols/pubsub/gossipsub.nim b/libp2p/protocols/pubsub/gossipsub.nim index 1390da742..70cfff967 100644 --- a/libp2p/protocols/pubsub/gossipsub.nim +++ b/libp2p/protocols/pubsub/gossipsub.nim @@ -26,8 +26,8 @@ logScope: topics = "gossipsub" const - GossipSubCodec* = "/meshsub/1.0.0" - GossipSubCodec_11* = "/meshsub/1.1.0" + GossipSubCodec* = "/meshsub/1.1.0" + GossipSubCodec_10* = "/meshsub/1.0.0" # overlay parameters const @@ -132,8 +132,8 @@ method init*(g: GossipSub) = await g.handleConn(conn, proto) g.handler = handler - g.codecs &= GossipSubCodec_11 g.codecs &= GossipSubCodec + g.codecs &= GossipSubCodec_10 proc replenishFanout(g: GossipSub, topic: string) = ## get fanout peers for a topic @@ -336,7 +336,7 @@ method handleDisconnect*(g: GossipSub, peer: PubSubPeer) = method subscribePeer*(p: GossipSub, conn: Connection) = procCall PubSub(p).subscribePeer(conn) - asyncCheck p.handleConn(conn, GossipSubCodec_11) + asyncCheck p.handleConn(conn, GossipSubCodec) method subscribeTopic*(g: GossipSub, topic: string, diff --git a/tests/testinterop.nim b/tests/testinterop.nim index e5138b087..b888495e1 100644 --- a/tests/testinterop.nim +++ b/tests/testinterop.nim @@ -26,7 +26,8 @@ import ../libp2p/[daemon/daemonapi, transports/tcptransport, protocols/secure/secure, protocols/pubsub/pubsub, - protocols/pubsub/floodsub, gossipsub] + protocols/pubsub/floodsub, + protocols/pubsub/gossipsub] type # TODO: Unify both PeerInfo structs