Skip to content

Commit

Permalink
Merge branch 'dev' into chris/context-cause
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisSchinnerl authored Apr 18, 2024
2 parents ab1dc52 + 32583da commit 1818867
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion api/autopilot.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ type (
} `json:"gouging"`
NotAcceptingContracts uint64 `json:"notAcceptingContracts"`
NotScanned uint64 `json:"notScanned"`
}
} `json:"unusable"`
Recommendation *ConfigRecommendation `json:"recommendation,omitempty"`
}
)
Expand Down
1 change: 0 additions & 1 deletion bus/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion cmd/renterd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" {
Expand Down
1 change: 0 additions & 1 deletion internal/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type BusConfig struct {
DBDialector gorm.Dialector
DBMetricsDialector gorm.Dialector
SlabPruningInterval time.Duration
SlabPruningCooldown time.Duration
}

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 @@ -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
Expand Down Expand Up @@ -896,7 +896,6 @@ func testBusCfg() node.BusConfig {
},
Network: testNetwork(),
SlabPruningInterval: time.Second,
SlabPruningCooldown: 10 * time.Millisecond,
}
}

Expand Down
13 changes: 3 additions & 10 deletions internal/test/e2e/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 1818867

Please sign in to comment.