fix: resolve panic in test

Author: gacevicljubisa

pkg/node/bootstrap.go

@@ -73,6 +73,7 @@ func bootstrapNode(
 	networkID uint64,
 	logger log.Logger,
 	libp2pPrivateKey *ecdsa.PrivateKey,
+	detector *stabilization.Detector,
 	o *Options,
 ) (snapshot *postage.ChainSnapshot, retErr error) {
 	tracer, tracerCloser, err := tracing.NewTracer(&tracing.Options{
@@ -116,15 +117,6 @@ func bootstrapNode(
 	}
 	b.hiveCloser = hive
 
-	detector, err := stabilization.NewDetector(stabilization.Config{
-		RelativeSlowdownFactor: 10,
-		MinSlowSamples:         10,
-		WarmupTime:             0,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("rate stabilizer: %w", err)
-	}
-
 	kad, err := kademlia.New(swarmAddress, addressbook, hive, p2ps, detector, logger,
 		kademlia.Options{Bootnodes: bootnodes, BootnodeMode: o.BootnodeMode, StaticNodes: o.StaticNodes, DataDir: o.DataDir})
 	if err != nil {

pkg/node/node.go

@@ -578,6 +578,27 @@ func NewBee(
 		return nil, fmt.Errorf("invalid payment early: %d", o.PaymentEarly)
 	}
 
+	detector, err := stabilization.NewDetector(stabilization.Config{
+		RelativeSlowdownFactor: 100,
+		MinSlowSamples:         20,
+		WarmupTime:             warmupTime,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("rate stabilizer: %w", err)
+	}
+
+	detector.OnPeakStart = func(t time.Time) {
+		logger.Info("rateStabilizer: START", "timestamp", t)
+	}
+
+	detector.OnStabilized = func(t time.Time, counter int) {
+		logger.Info("rateStabilizer: STABLE", "timestamp", t, "counter", counter)
+	}
+
+	detector.OnRateIncrease = func(t time.Time, minDuration time.Duration) {
+		logger.Info("rateStabilizer: RATE", "timestamp", t, "minDuration", minDuration)
+	}
+
 	var initBatchState *postage.ChainSnapshot
 	// Bootstrap node with postage snapshot only if it is running on mainnet, is a fresh
 	// install or explicitly asked by user to resync
@@ -597,6 +618,7 @@ func NewBee(
 			networkID,
 			log.Noop,
 			libp2pPrivateKey,
+			detector,
 			o,
 		)
 		logger.Info("bootstrapper created", "elapsed", time.Since(start))
@@ -701,27 +723,6 @@ func NewBee(
 
 	var swapService *swap.Service
 
-	detector, err := stabilization.NewDetector(stabilization.Config{
-		RelativeSlowdownFactor: 100,
-		MinSlowSamples:         20,
-		WarmupTime:             warmupTime,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("rate stabilizer: %w", err)
-	}
-
-	detector.OnPeakStart = func(t time.Time) {
-		logger.Info("rateStabilizer: START", "timestamp", t)
-	}
-
-	detector.OnStabilized = func(t time.Time, counter int) {
-		logger.Info("rateStabilizer: STABLE", "timestamp", t, "counter", counter)
-	}
-
-	detector.OnRateIncrease = func(t time.Time, minDuration time.Duration) {
-		logger.Info("rateStabilizer: RATE", "timestamp", t, "minDuration", minDuration)
-	}
-
 	kad, err := kademlia.New(swarmAddress, addressbook, hive, p2ps, detector, logger,
 		kademlia.Options{Bootnodes: bootnodes, BootnodeMode: o.BootnodeMode, StaticNodes: o.StaticNodes, DataDir: o.DataDir})
 	if err != nil {

pkg/stabilization/stabilization.go

@@ -134,10 +134,6 @@ func NewDetector(cfg Config) (*Detector, error) {
 // Returns the timestamp of the recorded event.
 // If the state is already Stabilized, this function does nothing.
 func (d *Detector) Record() time.Time {
-	if d == nil {
-		return time.Time{}
-	}
-
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
@@ -225,10 +221,6 @@ func (d *Detector) recordAt(t time.Time) {
 
 // State returns the current detected rate state.
 func (d *Detector) State() RateState {
-	if d == nil {
-		return StateIdle
-	}
-
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 	return d.currentState
@@ -263,10 +255,6 @@ func (d *Detector) Subscribe() (c <-chan struct{}) {
 }
 
 func (d *Detector) IsStabilized() bool {
-	if d == nil {
-		return true
-	}
-
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 

pkg/storer/storer_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/ethersphere/bee/v2/pkg/log"
 	"github.com/ethersphere/bee/v2/pkg/postage"
 	batchstore "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock"
+	ssmock "github.com/ethersphere/bee/v2/pkg/stabilization/mock"
 	"github.com/ethersphere/bee/v2/pkg/storage"
 	"github.com/ethersphere/bee/v2/pkg/storage/migration"
 	"github.com/ethersphere/bee/v2/pkg/storer"
@@ -178,7 +179,6 @@ func TestNew(t *testing.T) {
 }
 
 func dbTestOps(baseAddr swarm.Address, reserveCapacity int, bs postage.Storer, radiusSetter topology.SetStorageRadiuser, reserveWakeUpTime time.Duration) *storer.Options {
-
 	opts := storer.DefaultOptions()
 
 	if radiusSetter == nil {
@@ -194,6 +194,7 @@ func dbTestOps(baseAddr swarm.Address, reserveCapacity int, bs postage.Storer, r
 	opts.ReserveCapacity = reserveCapacity
 	opts.Batchstore = bs
 	opts.ReserveWakeUpDuration = reserveWakeUpTime
+	opts.StabilizationSubscriber = ssmock.NewSubscriber(true)
 
 	return opts
 }