chore: address comments

ChainSafe · Aug 16, 2023 · e5b97c1 · e5b97c1
1 parent c2bdb93
commit e5b97c1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 18 deletions.
diff --git a/chain/westend/defaults.go b/chain/westend/defaults.go
@@ -13,8 +13,7 @@ var (
 	// defaultID Default chain ID
 	defaultID = "westend2"
 	// defaultBasePath Default node base directory path
-	defaultBasePath = "/Volumes/SDD01/gossamer/westend"
-	//defaultBasePath = "~/.gossamer/westend"
+	defaultBasePath = "~/.gossamer/westend"
 	// defaultChainSpec is the default chain specification path
 	defaultChainSpec = "./chain/westend/genesis.json"
 )
@@ -30,14 +29,6 @@ func DefaultConfig() *cfg.Config {
 	config.Core.GrandpaAuthority = false
 	config.Core.Role = 1
 	config.Network.NoMDNS = false
-	config.Network.MaxPeers = 128
-	config.PrometheusExternal = true
-	config.PrometheusPort = 9876
 
-	config.Log.Sync = "trace"
-	config.Log.Digest = "trace"
-
-	config.Pprof.Enabled = true
-	config.Pprof.ListeningAddress = "0.0.0.0:6060"
 	return config
 }
diff --git a/dot/node_integration_test.go b/dot/node_integration_test.go
@@ -85,7 +85,7 @@ func TestNewNode(t *testing.T) {
 	assert.NoError(t, err)
 
 	mockServiceRegistry := NewMockServiceRegisterer(ctrl)
-	mockServiceRegistry.EXPECT().RegisterService(gomock.Any()).Times(9)
+	mockServiceRegistry.EXPECT().RegisterService(gomock.Any()).Times(8)
 
 	m := NewMocknodeBuilderIface(ctrl)
 	m.EXPECT().isNodeInitialised(initConfig.BasePath).Return(nil)
@@ -324,7 +324,6 @@ func TestStartStopNode(t *testing.T) {
 	config.ChainSpec = genFile
 	config.Core.GrandpaAuthority = false
 	config.Core.BabeAuthority = false
-	config.Network.MinPeers = 0
 
 	err := InitNode(config)
 	require.NoError(t, err)

diff --git a/dot/state/block_finalisation.go b/dot/state/block_finalisation.go
@@ -144,8 +144,8 @@ func (bs *BlockState) SetFinalisedHash(hash common.Hash, round, setID uint64) er
 	}
 
 	pruned := bs.bt.Prune(hash)
-	for _, prunedHash := range pruned {
-		blockHeader := bs.unfinalisedBlocks.delete(prunedHash)
+	for _, hash := range pruned {
+		blockHeader := bs.unfinalisedBlocks.delete(hash)
 		if blockHeader == nil {
 			continue
 		}

diff --git a/dot/sync/chain_sync.go b/dot/sync/chain_sync.go
@@ -189,11 +189,13 @@ func (cs *chainSync) waitEnoughPeersAndTarget() <-chan struct{} {
 
 			cs.workerPool.useConnectedPeers()
 			_, err := cs.getTarget()
+
 			totalAvailable := cs.workerPool.totalWorkers()
 			if totalAvailable >= uint(cs.minPeers) && err == nil {
 				return
 			}
 
+			// TODO: https://github.com/ChainSafe/gossamer/issues/3402
 			time.Sleep(100 * time.Millisecond)
 		}
 	}()

diff --git a/dot/sync/chain_sync_test.go b/dot/sync/chain_sync_test.go
@@ -529,6 +529,7 @@ func TestChainSync_BootstrapSync_SuccessfulSync_WithOneWorker(t *testing.T) {
 	mockStorageState := NewMockStorageState(ctrl)
 	mockImportHandler := NewMockBlockImportHandler(ctrl)
 	mockTelemetry := NewMockTelemetry(ctrl)
+
 	const announceBlock = false
 	// setup mocks for new synced blocks that doesn't exists in our local database
 	ensureSuccessfulBlockImportFlow(t, mockedGenesisHeader, totalBlockResponse.BlockData, mockedBlockState,

diff --git a/lib/trie/database.go b/lib/trie/database.go
@@ -79,10 +79,6 @@ func (t *Trie) loadNode(db DBGetter, n *Node) error {
 		}
 
 		nodeHash := merkleValue
-		if len(nodeHash) < 1 {
-			fmt.Printf(">>>>>>>>>> trie loadNode, empty node hash\n")
-		}
-
 		encodedNode, err := db.Get(nodeHash)
 		if err != nil {
 			return fmt.Errorf("cannot find child node key 0x%x in database: %w", nodeHash, err)