fix: remove sleep and refactor code (#5107)

Author: gacevicljubisa

cmd/bee/cmd/start.go

@@ -68,7 +68,6 @@ func (c *command) initStartCmd() (err error) {
 			}
 
 			fmt.Print(beeWelcomeMessage)
-			time.Sleep(5 * time.Second)
 			fmt.Printf("\n\nversion: %v - planned to be supported until %v, please follow https://ethswarm.org/\n\n", bee.Version, endSupportDate())
 			logger.Info("bee version", "version", bee.Version)
 

pkg/node/chain.go

@@ -413,4 +413,7 @@ func (m noOpChainBackend) FilterLogs(context.Context, ethereum.FilterQuery) ([]t
 func (m noOpChainBackend) ChainID(context.Context) (*big.Int, error) {
 	return big.NewInt(m.chainID), nil
 }
-func (m noOpChainBackend) Close() {}
+
+func (m noOpChainBackend) Close() error {
+	return nil
+}

pkg/node/node.go

@@ -106,7 +106,7 @@ type Bee struct {
 	pullSyncCloser           io.Closer
 	pssCloser                io.Closer
 	gsocCloser               io.Closer
-	ethClientCloser          func()
+	ethClientCloser          io.Closer
 	transactionMonitorCloser io.Closer
 	transactionCloser        io.Closer
 	listenerCloser           io.Closer
@@ -394,7 +394,7 @@ func NewBee(
 	if err != nil {
 		return nil, fmt.Errorf("init chain: %w", err)
 	}
-	b.ethClientCloser = chainBackend.Close
+	b.ethClientCloser = chainBackend
 
 	logger.Info("using chain with network network", "chain_id", chainID, "network_id", networkID)
 
@@ -1282,6 +1282,12 @@ func (b *Bee) SyncingStopped() chan struct{} {
 	return b.syncingStopped.C
 }
 
+// namedCloser is a helper struct to associate a closer with its name.
+type namedCloser struct {
+	closer io.Closer
+	name   string
+}
+
 func (b *Bee) Shutdown() error {
 	var mErr error
 
@@ -1335,42 +1341,27 @@ func (b *Bee) Shutdown() error {
 	}
 
 	var wg sync.WaitGroup
-	wg.Add(8)
-	go func() {
-		defer wg.Done()
-		tryClose(b.pssCloser, "pss")
-	}()
-	go func() {
-		defer wg.Done()
-		tryClose(b.gsocCloser, "gsoc")
-	}()
-	go func() {
-		defer wg.Done()
-		tryClose(b.pusherCloser, "pusher")
-	}()
-	go func() {
-		defer wg.Done()
-		tryClose(b.pullerCloser, "puller")
-	}()
-	go func() {
-		defer wg.Done()
-		tryClose(b.accountingCloser, "accounting")
-	}()
 
-	b.ctxCancel()
-	go func() {
-		defer wg.Done()
-		tryClose(b.pullSyncCloser, "pull sync")
-	}()
-	go func() {
-		defer wg.Done()
-		tryClose(b.hiveCloser, "hive")
-	}()
-	go func() {
-		defer wg.Done()
-		tryClose(b.saludCloser, "salud")
-	}()
+	closers := []namedCloser{
+		{b.pssCloser, "pss"},
+		{b.gsocCloser, "gsoc"},
+		{b.pusherCloser, "pusher"},
+		{b.pullerCloser, "puller"},
+		{b.accountingCloser, "accounting"},
+		{b.pullSyncCloser, "pull sync"},
+		{b.hiveCloser, "hive"},
+		{b.saludCloser, "salud"},
+	}
+
+	wg.Add(len(closers))
+	for _, nc := range closers {
+		go func(c io.Closer, name string) {
+			defer wg.Done()
+			tryClose(c, name)
+		}(nc.closer, nc.name)
+	}
 
+	b.ctxCancel()
 	wg.Wait()
 
 	tryClose(b.p2pService, "p2p server")
@@ -1393,10 +1384,7 @@ func (b *Bee) Shutdown() error {
 
 	wg.Wait()
 
-	if c := b.ethClientCloser; c != nil {
-		c()
-	}
-
+	tryClose(b.ethClientCloser, "eth client")
 	tryClose(b.accesscontrolCloser, "accesscontrol")
 	tryClose(b.tracerCloser, "tracer")
 	tryClose(b.topologyCloser, "topology driver")

pkg/transaction/backend.go

@@ -33,8 +33,7 @@ type Backend interface {
 	NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error)
 	FilterLogs(ctx context.Context, query ethereum.FilterQuery) ([]types.Log, error)
 	ChainID(ctx context.Context) (*big.Int, error)
-
-	Close()
+	Close() error
 }
 
 // IsSynced will check if we are synced with the given blockchain backend. This

pkg/transaction/backendmock/backend.go

@@ -127,6 +127,7 @@ func (m *backendMock) BalanceAt(ctx context.Context, address common.Address, blo
 	}
 	return nil, errors.New("not implemented")
 }
+
 func (m *backendMock) NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error) {
 	if m.nonceAt != nil {
 		return m.nonceAt(ctx, account, blockNumber)
@@ -145,7 +146,8 @@ func (m *backendMock) ChainID(ctx context.Context) (*big.Int, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *backendMock) Close() {
+func (m *backendMock) Close() error {
+	return nil
 }
 
 func New(opts ...Option) transaction.Backend {

pkg/transaction/backendsimulation/backend.go

@@ -151,6 +151,7 @@ func (m *simulatedBackend) HeaderByNumber(ctx context.Context, number *big.Int)
 func (m *simulatedBackend) BalanceAt(ctx context.Context, address common.Address, block *big.Int) (*big.Int, error) {
 	return nil, errors.New("not implemented")
 }
+
 func (m *simulatedBackend) NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error) {
 	nonce, ok := m.noncesAt[AccountAtKey{Account: account, BlockNumber: blockNumber.Uint64()}]
 	if ok {
@@ -168,5 +169,6 @@ func (m *simulatedBackend) ChainID(ctx context.Context) (*big.Int, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *simulatedBackend) Close() {
+func (m *simulatedBackend) Close() error {
+	return nil
 }

pkg/transaction/wrapped/wrapped.go

@@ -12,19 +12,18 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethersphere/bee/v2/pkg/transaction"
 )
 
-var (
-	_ transaction.Backend = (*wrappedBackend)(nil)
-)
+var _ transaction.Backend = (*wrappedBackend)(nil)
 
 type wrappedBackend struct {
-	backend transaction.Backend
+	backend *ethclient.Client
 	metrics metrics
 }
 
-func NewBackend(backend transaction.Backend) transaction.Backend {
+func NewBackend(backend *ethclient.Client) transaction.Backend {
 	return &wrappedBackend{
 		backend: backend,
 		metrics: newMetrics(),
@@ -202,6 +201,7 @@ func (b *wrappedBackend) ChainID(ctx context.Context) (*big.Int, error) {
 	return chainID, nil
 }
 
-func (b *wrappedBackend) Close() {
+func (b *wrappedBackend) Close() error {
 	b.backend.Close()
+	return nil
 }