fix test (#4670)

* fix test
filecoin-project · Jan 5, 2022 · 22a9f7a · 22a9f7a
1 parent e54464d
commit 22a9f7a
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/app/submodule/network/network_submodule.go b/app/submodule/network/network_submodule.go
@@ -76,6 +76,9 @@ type NetworkSubmodule struct { //nolint
 	//data transfer
 	DataTransfer     datatransfer.Manager
 	DataTransferHost dtnet.DataTransferNetwork
+
+	// fix datastore closed before flush
+	cancel context.CancelFunc
 }
 
 //API create a new network implement
@@ -96,6 +99,7 @@ func (networkSubmodule *NetworkSubmodule) Stop(ctx context.Context) {
 	if err := networkSubmodule.Host.Close(); err != nil {
 		networkLogger.Errorf("error closing host: %s", err.Error())
 	}
+	networkSubmodule.cancel()
 }
 
 type networkConfig interface {
@@ -134,7 +138,8 @@ func NewNetworkSubmodule(ctx context.Context, config networkConfig) (*NetworkSub
 	var router routing.Routing
 	var pubsubMessageSigning bool
 	var peerMgr net.IPeerMgr
-	// if !config.OfflineMode() {
+	networkSubmodule := &NetworkSubmodule{}
+	ctx, networkSubmodule.cancel = context.WithCancel(ctx)
 	makeDHT := func(h host.Host) (routing.Routing, error) {
 		mode := dht.ModeAuto
 		opts := []dht.Option{dht.Mode(mode),
@@ -238,19 +243,19 @@ func NewNetworkSubmodule(ctx context.Context, config networkConfig) (*NetworkSub
 	network := net.New(peerHost, net.NewRouter(router), bandwidthTracker)
 
 	// build the network submdule
-	return &NetworkSubmodule{
-		NetworkName:      networkName,
-		Host:             peerHost,
-		Router:           router,
-		Pubsub:           gsub,
-		Bitswap:          bswap,
-		GraphExchange:    gsync,
-		Network:          network,
-		DataTransfer:     dt,
-		DataTransferHost: dtNet,
-		PeerMgr:          peerMgr,
-		Blockstore:       config.Repo().Datastore(),
-	}, nil
+	networkSubmodule.NetworkName = networkName
+	networkSubmodule.Host = peerHost
+	networkSubmodule.Router = router
+	networkSubmodule.Pubsub = gsub
+	networkSubmodule.Bitswap = bswap
+	networkSubmodule.GraphExchange = gsync
+	networkSubmodule.Network = network
+	networkSubmodule.DataTransfer = dt
+	networkSubmodule.DataTransferHost = dtNet
+	networkSubmodule.PeerMgr = peerMgr
+	networkSubmodule.Blockstore = config.Repo().Datastore()
+
+	return networkSubmodule, nil
 }
 
 func (networkSubmodule *NetworkSubmodule) FetchMessagesByCids(