diff --git a/api/autopilot.go b/api/autopilot.go index 3938d42b7..9ca917f6e 100644 --- a/api/autopilot.go +++ b/api/autopilot.go @@ -123,7 +123,7 @@ type ( } `json:"gouging"` NotAcceptingContracts uint64 `json:"notAcceptingContracts"` NotScanned uint64 `json:"notScanned"` - } + } `json:"unusable"` Recommendation *ConfigRecommendation `json:"recommendation,omitempty"` } ) diff --git a/bus/client/client_test.go b/bus/client/client_test.go index 9cd1e80e7..795439669 100644 --- a/bus/client/client_test.go +++ b/bus/client/client_test.go @@ -80,7 +80,6 @@ func newTestClient(dir string) (*client.Client, func() error, func(context.Conte }, Miner: node.NewMiner(client), SlabPruningInterval: time.Minute, - SlabPruningCooldown: time.Minute, }, filepath.Join(dir, "bus"), types.GeneratePrivateKey(), zap.New(zapcore.NewNopCore())) if err != nil { return nil, nil, nil, err diff --git a/cmd/renterd/main.go b/cmd/renterd/main.go index 3005b4b34..c569b304b 100644 --- a/cmd/renterd/main.go +++ b/cmd/renterd/main.go @@ -436,7 +436,6 @@ func main() { Bus: cfg.Bus, Network: network, SlabPruningInterval: time.Hour, - SlabPruningCooldown: 30 * time.Second, } // Init db dialector if cfg.Database.MySQL.URI != "" { diff --git a/internal/node/node.go b/internal/node/node.go index d247f199a..293363653 100644 --- a/internal/node/node.go +++ b/internal/node/node.go @@ -45,7 +45,6 @@ type BusConfig struct { DBDialector gorm.Dialector DBMetricsDialector gorm.Dialector SlabPruningInterval time.Duration - SlabPruningCooldown time.Duration } type AutopilotConfig struct { diff --git a/internal/test/e2e/cluster.go b/internal/test/e2e/cluster.go index 1a8c016c6..dca4390f5 100644 --- a/internal/test/e2e/cluster.go +++ b/internal/test/e2e/cluster.go @@ -168,7 +168,7 @@ type testClusterOptions struct { // newTestLogger creates a console logger used for testing. func newTestLogger() *zap.Logger { - return newTestLoggerCustom(zapcore.ErrorLevel) + return newTestLoggerCustom(zapcore.DebugLevel) } // newTestLoggerCustom creates a console logger used for testing and allows @@ -896,7 +896,6 @@ func testBusCfg() node.BusConfig { }, Network: testNetwork(), SlabPruningInterval: time.Second, - SlabPruningCooldown: 10 * time.Millisecond, } } diff --git a/internal/test/e2e/cluster_test.go b/internal/test/e2e/cluster_test.go index a91858aef..72ac4b95b 100644 --- a/internal/test/e2e/cluster_test.go +++ b/internal/test/e2e/cluster_test.go @@ -27,7 +27,6 @@ import ( "go.sia.tech/renterd/object" "go.sia.tech/renterd/wallet" "go.uber.org/zap" - "go.uber.org/zap/zapcore" "lukechampine.com/frand" ) @@ -1453,9 +1452,7 @@ func TestWalletTransactions(t *testing.T) { t.SkipNow() } - cluster := newTestCluster(t, testClusterOptions{ - logger: newTestLoggerCustom(zapcore.DebugLevel), - }) + cluster := newTestCluster(t, clusterOptsDefault) defer cluster.Shutdown() b := cluster.Bus tt := cluster.tt @@ -1709,9 +1706,7 @@ func TestWallet(t *testing.T) { t.SkipNow() } - cluster := newTestCluster(t, testClusterOptions{ - logger: newTestLoggerCustom(zapcore.DebugLevel), - }) + cluster := newTestCluster(t, clusterOptsDefault) defer cluster.Shutdown() b := cluster.Bus tt := cluster.tt @@ -1916,9 +1911,7 @@ func TestAlerts(t *testing.T) { t.SkipNow() } - cluster := newTestCluster(t, testClusterOptions{ - logger: newTestLoggerCustom(zapcore.DebugLevel), - }) + cluster := newTestCluster(t, clusterOptsDefault) defer cluster.Shutdown() b := cluster.Bus tt := cluster.tt