From 7dd4e0bfebe440031880793366c24edbea129305 Mon Sep 17 00:00:00 2001 From: keks Date: Thu, 16 Nov 2017 14:21:21 +0100 Subject: [PATCH] vet used for range variable inside goroutine, now passed as argument --- comm.go | 6 +++--- floodsub.go | 16 ++++++++-------- floodsub_test.go | 8 ++++---- notify.go | 4 ++-- pb/rpc.pb.go | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/comm.go b/comm.go index adda4d4..cde23c5 100644 --- a/comm.go +++ b/comm.go @@ -7,9 +7,9 @@ import ( pb "github.com/libp2p/go-floodsub/pb" - ggio "github.com/gogo/protobuf/io" - proto "github.com/gogo/protobuf/proto" - inet "github.com/libp2p/go-libp2p-net" + inet "gx/ipfs/QmNa31VPzC561NWwRsJLE7nGYZYuuD2QfpK2b1q9BK54J1/go-libp2p-net" + ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io" + proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" ) // get the initial RPC containing all of our subscriptions to send to new peers diff --git a/floodsub.go b/floodsub.go index 7a22d8d..244c68f 100644 --- a/floodsub.go +++ b/floodsub.go @@ -9,12 +9,12 @@ import ( pb "github.com/libp2p/go-floodsub/pb" - logging "github.com/ipfs/go-log" - host "github.com/libp2p/go-libp2p-host" - inet "github.com/libp2p/go-libp2p-net" - peer "github.com/libp2p/go-libp2p-peer" - protocol "github.com/libp2p/go-libp2p-protocol" - timecache "github.com/whyrusleeping/timecache" + inet "gx/ipfs/QmNa31VPzC561NWwRsJLE7nGYZYuuD2QfpK2b1q9BK54J1/go-libp2p-net" + logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" + peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer" + timecache "gx/ipfs/QmYftoT56eEfUBTD3erR6heXuPSUhGRezSmhSU8LeczP8b/timecache" + protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" + host "gx/ipfs/Qmc1XhrFEiSeBNn3mpfg6gEuYCt5im2gYmNVmncsvmpeAk/go-libp2p-host" ) const ID = protocol.ID("/floodsub/1.0.0") @@ -328,14 +328,14 @@ func (p *PubSub) handleIncomingRPC(rpc *RPC) error { } subs := p.getSubscriptions(&Message{pmsg}) // call before goroutine! - go func() { + go func(pmsg *pb.Message) { if p.validate(subs, &Message{pmsg}) { p.sendMsg <- sendReq{ from: rpc.from, msg: &Message{pmsg}, } } - }() + }(pmsg) } return nil } diff --git a/floodsub_test.go b/floodsub_test.go index d520680..c43ecd2 100644 --- a/floodsub_test.go +++ b/floodsub_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - host "github.com/libp2p/go-libp2p-host" - netutil "github.com/libp2p/go-libp2p-netutil" - peer "github.com/libp2p/go-libp2p-peer" + netutil "gx/ipfs/QmQGX417WoxKxDJeHqouMEmmH4G1RCENNSzkZYHrXy3Xb3/go-libp2p-netutil" + peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer" + host "gx/ipfs/Qmc1XhrFEiSeBNn3mpfg6gEuYCt5im2gYmNVmncsvmpeAk/go-libp2p-host" //bhost "github.com/libp2p/go-libp2p/p2p/host/basic" - bhost "github.com/libp2p/go-libp2p-blankhost" + bhost "gx/ipfs/QmQkeGXc9ZuQ5upVFpd2EjKvgw9aVh1BbtAgvNGVcebmmX/go-libp2p-blankhost" ) func checkMessageRouting(t *testing.T, topic string, pubs []*PubSub, subs []*Subscription) { diff --git a/notify.go b/notify.go index 11cb4e5..19492f6 100644 --- a/notify.go +++ b/notify.go @@ -1,8 +1,8 @@ package floodsub import ( - inet "github.com/libp2p/go-libp2p-net" - ma "github.com/multiformats/go-multiaddr" + inet "gx/ipfs/QmNa31VPzC561NWwRsJLE7nGYZYuuD2QfpK2b1q9BK54J1/go-libp2p-net" + ma "gx/ipfs/QmXY77cVe7rVRQXZZQRioukUM7aRW3BTcAgJe12MCtb3Ji/go-multiaddr" ) var _ inet.Notifiee = (*PubSubNotif)(nil) diff --git a/pb/rpc.pb.go b/pb/rpc.pb.go index a5933c0..feab0c7 100644 --- a/pb/rpc.pb.go +++ b/pb/rpc.pb.go @@ -15,7 +15,7 @@ It has these top-level messages: */ package floodsub_pb -import proto "github.com/gogo/protobuf/proto" +import proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" import fmt "fmt" import math "math" -- GitLab