Merge pull request #8233 from filecoin-project/asr/libp2p-downgrade

Downgrade libp2p to 0.17.0

api/api_net.go

@@ -51,11 +51,6 @@ type Net interface {
 	NetBlockRemove(ctx context.Context, acl NetBlockList) error //perm:admin
 	NetBlockList(ctx context.Context) (NetBlockList, error)     //perm:read
 
-	// ResourceManager API
-	NetStat(ctx context.Context, scope string) (NetStat, error)          //perm:read
-	NetLimit(ctx context.Context, scope string) (NetLimit, error)        //perm:read
-	NetSetLimit(ctx context.Context, scope string, limit NetLimit) error //perm:admin
-
 	// ID returns peerID of libp2p node backing this API
 	ID(context.Context) (peer.ID, error) //perm:read
 }

api/docgen/docgen.go

@@ -300,34 +300,6 @@ func init() {
 		Error: "<error>",
 	})
 	addExample(storiface.ResourceTable)
-	addExample(network.ScopeStat{
-		Memory:             123,
-		NumStreamsInbound:  1,
-		NumStreamsOutbound: 2,
-		NumConnsInbound:    3,
-		NumConnsOutbound:   4,
-		NumFD:              5,
-	})
-	addExample(map[string]network.ScopeStat{
-		"abc": {
-			Memory:             123,
-			NumStreamsInbound:  1,
-			NumStreamsOutbound: 2,
-			NumConnsInbound:    3,
-			NumConnsOutbound:   4,
-			NumFD:              5,
-		}})
-	addExample(api.NetLimit{
-		Memory:          123,
-		StreamsInbound:  1,
-		StreamsOutbound: 2,
-		Streams:         3,
-		ConnsInbound:    3,
-		ConnsOutbound:   4,
-		Conns:           4,
-		FD:              5,
-	})
-
 }
 
 func GetAPIType(name, pkg string) (i interface{}, t reflect.Type, permStruct []reflect.Type) {

api/types.go

@@ -12,7 +12,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-graphsync"
 
-	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	ma "github.com/multiformats/go-multiaddr"
@@ -130,28 +129,6 @@ type NetBlockList struct {
 	IPSubnets []string
 }
 
-type NetStat struct {
-	System    *network.ScopeStat           `json:",omitempty"`
-	Transient *network.ScopeStat           `json:",omitempty"`
-	Services  map[string]network.ScopeStat `json:",omitempty"`
-	Protocols map[string]network.ScopeStat `json:",omitempty"`
-	Peers     map[string]network.ScopeStat `json:",omitempty"`
-}
-
-type NetLimit struct {
-	Dynamic bool `json:",omitempty"`
-	// set if Dynamic is false
-	Memory int64 `json:",omitempty"`
-	// set if Dynamic is true
-	MemoryFraction float64 `json:",omitempty"`
-	MinMemory      int64   `json:",omitempty"`
-	MaxMemory      int64   `json:",omitempty"`
-
-	Streams, StreamsInbound, StreamsOutbound int
-	Conns, ConnsInbound, ConnsOutbound       int
-	FD                                       int
-}
-
 type ExtendedPeerInfo struct {
 	ID          peer.ID
 	Agent       string

chain/sync_test.go

@@ -104,7 +104,7 @@ func prepSyncTest(t testing.TB, h int) *syncTestUtil {
 		ctx:    ctx,
 		cancel: cancel,
 
-		mn: mocknet.New(),
+		mn: mocknet.New(ctx),
 		g:  g,
 		us: filcns.DefaultUpgradeSchedule(),
 	}
@@ -158,7 +158,7 @@ func prepSyncTestWithV5Height(t testing.TB, h int, v5height abi.ChainEpoch) *syn
 		ctx:    ctx,
 		cancel: cancel,
 
-		mn: mocknet.New(),
+		mn: mocknet.New(ctx),
 		g:  g,
 		us: sched,
 	}

cli/net.go

@@ -36,8 +36,6 @@ var NetCmd = &cli.Command{
 		NetReachability,
 		NetBandwidthCmd,
 		NetBlockCmd,
-		NetStatCmd,
-		NetLimitCmd,
 	},
 }
 
@@ -608,103 +606,3 @@ var NetBlockListCmd = &cli.Command{
 		return nil
 	},
 }
-
-var NetStatCmd = &cli.Command{
-	Name:      "stat",
-	Usage:     "Report resource usage for a scope",
-	ArgsUsage: "scope",
-	Description: `Report resource usage for a scope.
-
-  The scope can be one of the following:
-  - system        -- reports the system aggregate resource usage.
-  - transient     -- reports the transient resource usage.
-  - svc:<service> -- reports the resource usage of a specific service.
-  - proto:<proto> -- reports the resource usage of a specific protocol.
-  - peer:<peer>   -- reports the resource usage of a specific peer.
-  - all           -- reports the resource usage for all currently active scopes.
-`,
-	Action: func(cctx *cli.Context) error {
-		api, closer, err := GetAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-		ctx := ReqContext(cctx)
-
-		args := cctx.Args().Slice()
-		if len(args) != 1 {
-			return xerrors.Errorf("must specify exactly one scope")
-		}
-		scope := args[0]
-
-		result, err := api.NetStat(ctx, scope)
-		if err != nil {
-			return err
-		}
-
-		enc := json.NewEncoder(os.Stdout)
-		return enc.Encode(result)
-	},
-}
-
-var NetLimitCmd = &cli.Command{
-	Name:      "limit",
-	Usage:     "Get or set resource limits for a scope",
-	ArgsUsage: "scope [limit]",
-	Description: `Get or set resource limits for a scope.
-
-  The scope can be one of the following:
-  - system        -- reports the system aggregate resource usage.
-  - transient     -- reports the transient resource usage.
-  - svc:<service> -- reports the resource usage of a specific service.
-  - proto:<proto> -- reports the resource usage of a specific protocol.
-  - peer:<peer>   -- reports the resource usage of a specific peer.
-
- The limit is json-formatted, with the same structure as the limits file.
-`,
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "set",
-			Usage: "set the limit for a scope",
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		api, closer, err := GetAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-		ctx := ReqContext(cctx)
-		args := cctx.Args().Slice()
-
-		if cctx.Bool("set") {
-			if len(args) != 2 {
-				return xerrors.Errorf("must specify exactly a scope and a limit")
-			}
-			scope := args[0]
-			limitStr := args[1]
-
-			var limit atypes.NetLimit
-			err := json.Unmarshal([]byte(limitStr), &limit)
-			if err != nil {
-				return xerrors.Errorf("error decoding limit: %w", err)
-			}
-
-			return api.NetSetLimit(ctx, scope, limit)
-
-		}
-
-		if len(args) != 1 {
-			return xerrors.Errorf("must specify exactly one scope")
-		}
-		scope := args[0]
-
-		result, err := api.NetLimit(ctx, scope)
-		if err != nil {
-			return err
-		}
-
-		enc := json.NewEncoder(os.Stdout)
-		return enc.Encode(result)
-	},
-}