Skip to content

Commit

Permalink
Remove unused slabPruningInterval from config (#1295)
Browse files Browse the repository at this point in the history
  • Loading branch information
peterjan authored Jun 12, 2024
1 parent 00b6999 commit 4ff9d5a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 17 deletions.
5 changes: 2 additions & 3 deletions bus/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,8 @@ func newTestClient(dir string) (*client.Client, func() error, func(context.Conte
DatabaseLog: config.DatabaseLog{
SlowThreshold: 100 * time.Millisecond,
},
Miner: node.NewMiner(client),
SlabPruningInterval: time.Minute,
Logger: zap.NewNop(),
Miner: node.NewMiner(client),
Logger: zap.NewNop(),
}, filepath.Join(dir, "bus"), types.GeneratePrivateKey(), zap.New(zapcore.NewNopCore()))
if err != nil {
return nil, nil, nil, err
Expand Down
11 changes: 5 additions & 6 deletions cmd/renterd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -446,12 +446,11 @@ func main() {

network, _ := build.Network()
busCfg := node.BusConfig{
Bus: cfg.Bus,
Database: cfg.Database,
DatabaseLog: cfg.Log.Database,
Logger: logger,
Network: network,
SlabPruningInterval: time.Hour,
Bus: cfg.Bus,
Database: cfg.Database,
DatabaseLog: cfg.Log.Database,
Logger: logger,
Network: network,
}

type shutdownFn struct {
Expand Down
11 changes: 5 additions & 6 deletions internal/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@ type Bus interface {

type BusConfig struct {
config.Bus
Database config.Database
DatabaseLog config.DatabaseLog
Network *consensus.Network
Logger *zap.Logger
Miner *Miner
SlabPruningInterval time.Duration
Database config.Database
DatabaseLog config.DatabaseLog
Network *consensus.Network
Logger *zap.Logger
Miner *Miner
}

type AutopilotConfig struct {
Expand Down
3 changes: 1 addition & 2 deletions internal/test/e2e/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,7 @@ func testBusCfg() node.BusConfig {
IgnoreRecordNotFoundError: true,
SlowThreshold: 100 * time.Millisecond,
},
Network: testNetwork(),
SlabPruningInterval: time.Second,
Network: testNetwork(),
}
}

Expand Down

0 comments on commit 4ff9d5a

Please sign in to comment.