disable mplex stream muxer

Author: simlecode

app/submodule/network/network_submodule.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-	"strings"
 	"time"
 
 	"github.com/ipfs/go-bitswap"
@@ -27,10 +26,8 @@ import (
 	"github.com/libp2p/go-libp2p"
 	"github.com/libp2p/go-libp2p-core/host"
 	p2pmetrics "github.com/libp2p/go-libp2p-core/metrics"
-	smux "github.com/libp2p/go-libp2p-core/mux"
 	"github.com/libp2p/go-libp2p-core/routing"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
-	mplex "github.com/libp2p/go-libp2p-mplex"
 	libp2pps "github.com/libp2p/go-libp2p-pubsub"
 	yamux "github.com/libp2p/go-libp2p-yamux"
 	ma "github.com/multiformats/go-multiaddr"
@@ -112,7 +109,7 @@ type networkConfig interface {
 // NewNetworkSubmodule creates a new network submodule.
 func NewNetworkSubmodule(ctx context.Context, config networkConfig) (*NetworkSubmodule, error) {
 	bandwidthTracker := p2pmetrics.NewBandwidthCounter()
-	libP2pOpts := append(config.Libp2pOpts(), libp2p.BandwidthReporter(bandwidthTracker), makeSmuxTransportOption(true))
+	libP2pOpts := append(config.Libp2pOpts(), libp2p.BandwidthReporter(bandwidthTracker), makeSmuxTransportOption())
 
 	var networkName string
 	var err error
@@ -400,9 +397,8 @@ func buildHost(ctx context.Context, config networkConfig, libP2pOpts []libp2p.Op
 	return libp2p.New(opts...)
 }
 
-func makeSmuxTransportOption(mplexExp bool) libp2p.Option {
+func makeSmuxTransportOption() libp2p.Option {
 	const yamuxID = "/yamux/1.0.0"
-	const mplexID = "/mplex/6.7.0"
 
 	ymxtpt := *yamux.DefaultTransport
 	ymxtpt.AcceptBacklog = 512
@@ -411,27 +407,5 @@ func makeSmuxTransportOption(mplexExp bool) libp2p.Option {
 		ymxtpt.LogOutput = os.Stderr
 	}
 
-	muxers := map[string]smux.Multiplexer{yamuxID: &ymxtpt}
-	if mplexExp {
-		muxers[mplexID] = mplex.DefaultTransport
-	}
-
-	// Allow muxer preference order overriding
-	order := []string{yamuxID, mplexID}
-	if prefs := os.Getenv("LIBP2P_MUX_PREFS"); prefs != "" {
-		order = strings.Fields(prefs)
-	}
-
-	opts := make([]libp2p.Option, 0, len(order))
-	for _, id := range order {
-		tpt, ok := muxers[id]
-		if !ok {
-			networkLogger.Warnf("unknown or duplicate muxer in LIBP2P_MUX_PREFS: %s", id)
-			continue
-		}
-		delete(muxers, id)
-		opts = append(opts, libp2p.Muxer(id, tpt))
-	}
-
-	return libp2p.ChainOptions(opts...)
+	return libp2p.Muxer(yamuxID, ymxtpt)
 }

cmd/state.go

@@ -82,7 +82,7 @@ var stateWaitMsgCmd = &cmds.Command{
 			writer.Printf("message was executed in tipset: %s\n", mw.TipSet.Cids())
 			writer.Printf("Exit Code: %d\n", mw.Receipt.ExitCode)
 			writer.Printf("Gas Used: %d\n", mw.Receipt.GasUsed)
-			writer.Printf("Return: %x\n", mw.Receipt.ReturnValue)
+			writer.Printf("Return: %x\n", mw.Receipt.Return)
 		} else {
 			writer.Printf("Unable to find message recepit of %s", cid)
 		}

go.mod

@@ -92,7 +92,6 @@ require (
 	github.com/libp2p/go-libp2p v0.17.0
 	github.com/libp2p/go-libp2p-core v0.13.0
 	github.com/libp2p/go-libp2p-kad-dht v0.15.0
-	github.com/libp2p/go-libp2p-mplex v0.4.1
 	github.com/libp2p/go-libp2p-peerstore v0.6.0
 	github.com/libp2p/go-libp2p-pubsub v0.6.0
 	github.com/libp2p/go-libp2p-swarm v0.9.0

pkg/messagepool/selection_test.go

@@ -5,8 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/stretchr/testify/require"
-	cbg "github.com/whyrusleeping/cbor-gen"
 	"io"
 	"math"
 	"math/big"
@@ -15,6 +13,9 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+	cbg "github.com/whyrusleeping/cbor-gen"
+
 	"github.com/filecoin-project/go-address"
 	tbig "github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/crypto"
@@ -577,7 +578,7 @@ func TestMessageSelectionTrimmingMsgsBasic(t *testing.T) {
 
 	// the actors
 	w1 := newWallet(t)
-	a1, err := w1.NewAddress(address.SECP256K1)
+	a1, err := w1.NewAddress(context.Background(), address.SECP256K1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -616,16 +617,17 @@ func TestMessageSelectionTrimmingMsgsBasic(t *testing.T) {
 
 func TestMessageSelectionTrimmingMsgsTwoSendersBasic(t *testing.T) {
 	mp, tma := makeTestMpool()
+	ctx := context.Background()
 
 	// the actors
 	w1 := newWallet(t)
-	a1, err := w1.NewAddress(address.SECP256K1)
+	a1, err := w1.NewAddress(ctx, address.SECP256K1)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	w2 := newWallet(t)
-	a2, err := w2.NewAddress(address.BLS)
+	a2, err := w2.NewAddress(ctx, address.BLS)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -674,16 +676,17 @@ func TestMessageSelectionTrimmingMsgsTwoSendersBasic(t *testing.T) {
 
 func TestMessageSelectionTrimmingMsgsTwoSendersAdvanced(t *testing.T) {
 	mp, tma := makeTestMpool()
+	ctx := context.Background()
 
 	// the actors
 	w1 := newWallet(t)
-	a1, err := w1.NewAddress(address.SECP256K1)
+	a1, err := w1.NewAddress(ctx, address.SECP256K1)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	w2 := newWallet(t)
-	a2, err := w2.NewAddress(address.BLS)
+	a2, err := w2.NewAddress(ctx, address.BLS)
 	if err != nil {
 		t.Fatal(err)
 	}