diff --git a/cmd/ipfs/idxprovider.go b/cmd/ipfs/idxprovider.go
index 553ea221186e..e2a5e4ea316d 100644
--- a/cmd/ipfs/idxprovider.go
+++ b/cmd/ipfs/idxprovider.go
@@ -375,7 +375,10 @@ func generateContextID() ([]byte, error) {
 		return nil, err
 	}
 	h := sha256.New()
-	h.Write(data)
+	if _, err := h.Write(data); err != nil {
+		return nil, err
+	}
+
 	return h.Sum(nil), nil
 }
 
diff --git a/core/coreapi/test/api_test.go b/core/coreapi/test/api_test.go
index 54f3b48ca431..e5ebfbb0292d 100644
--- a/core/coreapi/test/api_test.go
+++ b/core/coreapi/test/api_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-filestore"
-	"github.com/ipfs/go-ipfs-keystore"
+	keystore "github.com/ipfs/go-ipfs-keystore"
 	"github.com/ipfs/go-ipfs/core"
 	"github.com/ipfs/go-ipfs/core/bootstrap"
 	"github.com/ipfs/go-ipfs/core/coreapi"
@@ -19,12 +19,12 @@ import (
 
 	"github.com/ipfs/go-datastore"
 	syncds "github.com/ipfs/go-datastore/sync"
-	"github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs-config"
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/tests"
 	"github.com/libp2p/go-libp2p-core/crypto"
 	peer "github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 )
 
 const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
@@ -32,7 +32,7 @@ const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
 type NodeProvider struct{}
 
 func (NodeProvider) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
-	mn := mocknet.New(ctx)
+	mn := mocknet.New()
 
 	nodes := make([]*core.IpfsNode, n)
 	apis := make([]coreiface.CoreAPI, n)
diff --git a/core/mock/mock.go b/core/mock/mock.go
index d0a5cd7f65ca..10a2290a21d4 100644
--- a/core/mock/mock.go
+++ b/core/mock/mock.go
@@ -31,7 +31,7 @@ func NewMockNode() (*core.IpfsNode, error) {
 	// effectively offline, only peer in its network
 	return core.NewNode(ctx, &core.BuildCfg{
 		Online: true,
-		Host:   MockHostOption(mocknet.New(ctx)),
+		Host:   MockHostOption(mocknet.New()),
 	})
 }
 
diff --git a/core/node/libp2p/smux.go b/core/node/libp2p/smux.go
index 8ce540109ce8..2e0eceb98ddf 100644
--- a/core/node/libp2p/smux.go
+++ b/core/node/libp2p/smux.go
@@ -7,12 +7,12 @@ import (
 
 	config "github.com/ipfs/go-ipfs-config"
 	"github.com/libp2p/go-libp2p"
-	smux "github.com/libp2p/go-libp2p-core/mux"
+	"github.com/libp2p/go-libp2p-core/network"
 	mplex "github.com/libp2p/go-libp2p-mplex"
 	yamux "github.com/libp2p/go-libp2p-yamux"
 )
 
-func yamuxTransport() smux.Multiplexer {
+func yamuxTransport() network.Multiplexer {
 	tpt := *yamux.DefaultTransport
 	tpt.AcceptBacklog = 512
 	if os.Getenv("YAMUX_DEBUG") != "" {
diff --git a/test/integration/addcat_test.go b/test/integration/addcat_test.go
index eebc1f63f76a..216728ca8cad 100644
--- a/test/integration/addcat_test.go
+++ b/test/integration/addcat_test.go
@@ -97,7 +97,7 @@ func DirectAddCat(data []byte, conf testutil.LatencyConfig) error {
 	defer cancel()
 
 	// create network
-	mn := mocknet.New(ctx)
+	mn := mocknet.New()
 	mn.SetLinkDefaults(mocknet.LinkOptions{
 		Latency: conf.NetworkLatency,
 		// TODO add to conf. This is tricky because we want 0 values to be functional.
diff --git a/test/integration/bench_cat_test.go b/test/integration/bench_cat_test.go
index 6115b5b54dd8..ff7ee78d6329 100644
--- a/test/integration/bench_cat_test.go
+++ b/test/integration/bench_cat_test.go
@@ -40,7 +40,7 @@ func benchCat(b *testing.B, data []byte, conf testutil.LatencyConfig) error {
 	defer cancel()
 
 	// create network
-	mn := mocknet.New(ctx)
+	mn := mocknet.New()
 	mn.SetLinkDefaults(mocknet.LinkOptions{
 		Latency: conf.NetworkLatency,
 		// TODO add to conf. This is tricky because we want 0 values to be functional.
diff --git a/test/integration/bitswap_wo_routing_test.go b/test/integration/bitswap_wo_routing_test.go
index ec0c2f11a830..9caa78c38c52 100644
--- a/test/integration/bitswap_wo_routing_test.go
+++ b/test/integration/bitswap_wo_routing_test.go
@@ -19,7 +19,7 @@ func TestBitswapWithoutRouting(t *testing.T) {
 	const numPeers = 4
 
 	// create network
-	mn := mocknet.New(ctx)
+	mn := mocknet.New()
 
 	var nodes []*core.IpfsNode
 	for i := 0; i < numPeers; i++ {
diff --git a/test/integration/three_legged_cat_test.go b/test/integration/three_legged_cat_test.go
index eb82d00083a8..dff03cb5a586 100644
--- a/test/integration/three_legged_cat_test.go
+++ b/test/integration/three_legged_cat_test.go
@@ -68,7 +68,7 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
 	defer cancel()
 
 	// create network
-	mn := mocknet.New(ctx)
+	mn := mocknet.New()
 	mn.SetLinkDefaults(mocknet.LinkOptions{
 		Latency: conf.NetworkLatency,
 		// TODO add to conf. This is tricky because we want 0 values to be functional.
diff --git a/test/integration/wan_lan_dht_test.go b/test/integration/wan_lan_dht_test.go
index da2468d5a1ed..579bcab68594 100644
--- a/test/integration/wan_lan_dht_test.go
+++ b/test/integration/wan_lan_dht_test.go
@@ -72,7 +72,7 @@ func RunDHTConnectivity(conf testutil.LatencyConfig, numPeers int) error {
 	defer cancel()
 
 	// create network
-	mn := mocknet.New(ctx)
+	mn := mocknet.New()
 	mn.SetLinkDefaults(mocknet.LinkOptions{
 		Latency:   conf.NetworkLatency,
 		Bandwidth: math.MaxInt32,