all: cleanup PR

SiaFoundation · Nov 6, 2024 · fb00944 · fb00944
1 parent 62e584b
commit fb00944
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/autopilot/autopilot.go b/autopilot/autopilot.go
@@ -30,9 +30,14 @@ type Bus interface {
 	alerts.Alerter
 	webhooks.Broadcaster
 
-	// Accounts
+	// accounts
 	Accounts(ctx context.Context, owner string) (accounts []api.Account, err error)
 
+	// autopilot
+	AutopilotState(ctx context.Context) (cfg api.AutopilotState, err error)
+	UpdateAutopilotConfig(ctx context.Context, cfg api.AutopilotConfig) error
+	UpdateAutopilotPeriod(ctx context.Context, period uint64) error
+
 	// consensus
 	ConsensusNetwork(ctx context.Context) (consensus.Network, error)
 	ConsensusState(ctx context.Context) (api.ConsensusState, error)
@@ -77,11 +82,6 @@ type Bus interface {
 	GougingSettings(ctx context.Context) (gs api.GougingSettings, err error)
 	UploadSettings(ctx context.Context) (us api.UploadSettings, err error)
 
-	// state
-	AutopilotState(ctx context.Context) (cfg api.AutopilotState, err error)
-	UpdateAutopilotConfig(ctx context.Context, cfg api.AutopilotConfig) error
-	UpdateAutopilotPeriod(ctx context.Context, period uint64) error
-
 	// syncer
 	SyncerPeers(ctx context.Context) (resp []string, err error)
 

diff --git a/autopilot/migrator.go b/autopilot/migrator.go
@@ -184,7 +184,7 @@ func (m *migrator) performMigrations(p *workerPool) {
 		m.logger.Errorf("failed to fetch autopilot state: %w", err)
 		return
 	}
-	set := state.AutopilotConfig.Contracts.Set
+	set := state.Contracts.Set
 	if set == "" {
 		m.logger.Error("could not perform migrations, no contract set configured")
 		return

diff --git a/bus/bus.go b/bus/bus.go
@@ -166,13 +166,13 @@ type (
 	// Store is a collection of stores used by the bus.
 	Store interface {
 		AccountStore
+		AutopilotStore
 		BackupStore
 		ChainStore
 		HostStore
 		MetadataStore
 		MetricsStore
 		SettingStore
-		StateStore
 	}
 
 	// AccountStore persists information about accounts. Since accounts
@@ -183,8 +183,8 @@ type (
 		SaveAccounts(context.Context, []api.Account) error
 	}
 
-	// A StateStore stores various configuration.
-	StateStore interface {
+	// A AutopilotStore stores autopilot state.
+	AutopilotStore interface {
 		AutopilotState(ctx context.Context) (api.AutopilotState, error)
 		UpdateAutopilotConfig(ctx context.Context, cfg api.AutopilotConfig) error
 		UpdateAutopilotPeriod(ctx context.Context, period uint64) error

diff --git a/bus/client/state.go → bus/client/autopilot.go b/bus/client/state.go → bus/client/autopilot.go
diff --git a/internal/sql/migrations.go b/internal/sql/migrations.go
@@ -355,8 +355,9 @@ var (
 					} else if err := json.Unmarshal(cfgraw, &cfg); err != nil {
 						log.Warnf("existing autopilot config not valid JSON, err %v", err)
 					} else {
-						res, err := tx.Exec(ctx, `UPDATE autopilot_state SET current_period = ?,contracts_amount = ?,contracts_period = ?,contracts_renew_window = ?,contracts_download = ?,contracts_upload = ?,contracts_storage = ?,contracts_prune = ?,hosts_allow_redundant_ips = ?,hosts_max_downtime_hours = ?,hosts_min_protocol_version = ?,hosts_max_consecutive_scan_failures = ? WHERE id = ?`,
+						res, err := tx.Exec(ctx, `UPDATE autopilot_state SET current_period = ?, contracts_set = ?, contracts_amount = ?, contracts_period = ?, contracts_renew_window = ?, contracts_download = ?, contracts_upload = ?, contracts_storage = ?, contracts_prune = ?, hosts_allow_redundant_ips = ?, hosts_max_downtime_hours = ?, hosts_min_protocol_version = ?, hosts_max_consecutive_scan_failures = ? WHERE id = ?`,
 							period,
+							cfg.Contracts.Set,
 							cfg.Contracts.Amount,
 							cfg.Contracts.Period,
 							cfg.Contracts.RenewWindow,

diff --git a/stores/state.go → stores/autopilot.go b/stores/state.go → stores/autopilot.go