Skip to content

Commit 1d5cf4c

Browse files
committed
Refactor error handling in Stop and remove node_test.go
1 parent d139856 commit 1d5cf4c

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

block/node.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package block
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67

78
goheader "github.com/celestiaorg/go-header"
@@ -62,26 +63,24 @@ func (bc *BlockComponents) Start(ctx context.Context) error {
6263

6364
// Stop stops all components
6465
func (bc *BlockComponents) Stop() error {
65-
var errs []error
66+
var errs error
6667
if bc.Executor != nil {
6768
if err := bc.Executor.Stop(); err != nil {
68-
errs = append(errs, fmt.Errorf("failed to stop executor: %w", err))
69+
errs = errors.Join(errs, fmt.Errorf("failed to stop executor: %w", err))
6970
}
7071
}
7172
if bc.Syncer != nil {
7273
if err := bc.Syncer.Stop(); err != nil {
73-
errs = append(errs, fmt.Errorf("failed to stop syncer: %w", err))
74+
errs = errors.Join(errs, fmt.Errorf("failed to stop syncer: %w", err))
7475
}
7576
}
7677
if bc.Submitter != nil {
7778
if err := bc.Submitter.Stop(); err != nil {
78-
errs = append(errs, fmt.Errorf("failed to stop submitter: %w", err))
79+
errs = errors.Join(errs, fmt.Errorf("failed to stop submitter: %w", err))
7980
}
8081
}
81-
if len(errs) > 0 {
82-
return fmt.Errorf("errors stopping components: %v", errs)
83-
}
84-
return nil
82+
83+
return errs
8584
}
8685

8786
// broadcaster interface for P2P broadcasting

block/node_test.go

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)