Fix readme and account refill interval consistency

.changeset/make_naming_for_accountrefillinterval_consistent_in_config.md

@@ -0,0 +1,5 @@
+---
+default: major
+---
+
+# Make naming for accountRefillInterval consistent in config

README.md

@@ -69,6 +69,7 @@ overview of all settings configurable through the CLI.
 | `Bus.RemotePassword`                 | Remote password for the bus                          | -                                 | -                               | `RENTERD_BUS_API_PASSWORD`                     | `bus.remotePassword`                |
 | `Bus.UsedUTXOExpiry`                 | Expiry for used UTXOs in transactions                | `24h`                             | `--bus.usedUTXOExpiry`          | -                                              | `bus.usedUtxoExpiry`                |
 | `Bus.SlabBufferCompletionThreshold`  | Threshold for slab buffer upload                     | `4096`                            | `--bus.slabBufferCompletionThreshold` | `RENTERD_BUS_SLAB_BUFFER_COMPLETION_THRESHOLD` | `bus.slabBufferCompletionThreshold` |
+| `Worker.AccountRefillInterval`       | Interval for refilling workers' account balances     | `10s`                             | `--worker.accountRefillInterval` | -                                           | `worker.accountRefillInterval`  |
 | `Worker.BusFlushInterval`            | Interval for flushing data to bus                    | `5s`                              | `--worker.busFlushInterval`      | -                                              | `worker.busFlushInterval`           |
 | `Worker.DownloadMaxOverdrive`        | Max overdrive workers for downloads                  | `5`                               | `--worker.downloadMaxOverdrive`  | -                                              | `worker.downloadMaxOverdrive`       |
 | `Worker.DownloadMaxMemory`           | Max memory for downloads                             | `1GiB`                            | `--worker.downloadMaxMemory`     | `RENTERD_WORKER_DOWNLOAD_MAX_MEMORY`           | `worker.downloadMaxMemory`          |

cmd/renterd/config.go

@@ -90,11 +90,10 @@ func defaultConfig() config.Config {
 			SlabBufferCompletionThreshold: 1 << 12,
 		},
 		Worker: config.Worker{
-			Enabled: true,
-
-			ID:                     "",
-			AccountsRefillInterval: defaultAccountRefillInterval,
-			BusFlushInterval:       5 * time.Second,
+			Enabled:               true,
+			ID:                    "",
+			AccountRefillInterval: defaultAccountRefillInterval,
+			BusFlushInterval:      5 * time.Second,
 
 			DownloadMaxOverdrive:     5,
 			DownloadOverdriveTimeout: 3 * time.Second,
@@ -281,7 +280,7 @@ func parseCLIFlags(cfg *config.Config) {
 	flag.Int64Var(&cfg.Bus.SlabBufferCompletionThreshold, "bus.slabBufferCompletionThreshold", cfg.Bus.SlabBufferCompletionThreshold, "Threshold for slab buffer upload (overrides with RENTERD_BUS_SLAB_BUFFER_COMPLETION_THRESHOLD)")
 
 	// worker
-	flag.DurationVar(&cfg.Worker.AccountsRefillInterval, "worker.accountRefillInterval", cfg.Worker.AccountsRefillInterval, "Interval for refilling workers' account balances")
+	flag.DurationVar(&cfg.Worker.AccountRefillInterval, "worker.accountRefillInterval", cfg.Worker.AccountRefillInterval, "Interval for refilling workers' account balances")
 	flag.DurationVar(&cfg.Worker.BusFlushInterval, "worker.busFlushInterval", cfg.Worker.BusFlushInterval, "Interval for flushing data to bus")
 	flag.Uint64Var(&cfg.Worker.DownloadMaxMemory, "worker.downloadMaxMemory", cfg.Worker.DownloadMaxMemory, "Max amount of RAM the worker allocates for slabs when downloading (overrides with RENTERD_WORKER_DOWNLOAD_MAX_MEMORY)")
 	flag.Uint64Var(&cfg.Worker.DownloadMaxOverdrive, "worker.downloadMaxOverdrive", cfg.Worker.DownloadMaxOverdrive, "Max overdrive workers for downloads")

config/config.go

@@ -115,7 +115,7 @@ type (
 	Worker struct {
 		Enabled                       bool          `yaml:"enabled,omitempty"`
 		ID                            string        `yaml:"id,omitempty"`
-		AccountsRefillInterval        time.Duration `yaml:"accountsRefillInterval,omitempty"`
+		AccountRefillInterval         time.Duration `yaml:"accountRefillInterval,omitempty"`
 		BusFlushInterval              time.Duration `yaml:"busFlushInterval,omitempty"`
 		DownloadOverdriveTimeout      time.Duration `yaml:"downloadOverdriveTimeout,omitempty"`
 		UploadOverdriveTimeout        time.Duration `yaml:"uploadOverdriveTimeout,omitempty"`

internal/test/e2e/cluster.go

@@ -999,7 +999,7 @@ func testDBCfg() dbConfig {
 
 func testWorkerCfg() config.Worker {
 	return config.Worker{
-		AccountsRefillInterval:   10 * time.Millisecond,
+		AccountRefillInterval:    10 * time.Millisecond,
 		ID:                       "worker",
 		BusFlushInterval:         testBusFlushInterval,
 		DownloadOverdriveTimeout: 500 * time.Millisecond,

worker/worker.go

@@ -620,7 +620,7 @@ func New(cfg config.Worker, masterKey [32]byte, b Bus, l *zap.Logger) (*Worker,
 		shutdownCtxCancel:    shutdownCancel,
 	}
 
-	if err := w.initAccounts(cfg.AccountsRefillInterval); err != nil {
+	if err := w.initAccounts(cfg.AccountRefillInterval); err != nil {
 		return nil, fmt.Errorf("failed to initialize accounts; %w", err)
 	}
 

worker/worker_test.go

@@ -155,7 +155,7 @@ func (w *testWorker) UsableHosts() []api.HostInfo {
 
 func newTestWorkerCfg() config.Worker {
 	return config.Worker{
-		AccountsRefillInterval:   time.Second,
+		AccountRefillInterval:    time.Second,
 		ID:                       "test",
 		BusFlushInterval:         time.Second,
 		DownloadOverdriveTimeout: time.Second,