Migrate renterd subscriber to coreutils types

api/contract.go

@@ -16,6 +16,8 @@ const (
 	ContractStateFailed   = "failed"
 )
 
+type ContractState string
+
 const (
 	ContractArchivalReasonHostPruned = "hostpruned"
 	ContractArchivalReasonRemoved    = "removed"

bus/bus.go

@@ -26,6 +26,7 @@ import (
 	"go.sia.tech/renterd/api"
 	"go.sia.tech/renterd/build"
 	"go.sia.tech/renterd/bus/client"
+	"go.sia.tech/renterd/chain"
 	"go.sia.tech/renterd/hostdb"
 	"go.sia.tech/renterd/object"
 	"go.sia.tech/renterd/webhooks"
@@ -62,6 +63,11 @@ type (
 		UnconfirmedParents(txn types.Transaction) []types.Transaction
 	}
 
+	// ChainStore stores chain state.
+	ChainStore interface {
+		ApplyChainUpdate(ctx context.Context, cu *chain.Update) error
+	}
+
 	// A TransactionPool can validate and relay unconfirmed transactions.
 	TransactionPool interface {
 		AcceptTransactionSet(txns []types.Transaction) error
@@ -1770,7 +1776,6 @@ func (b *bus) paramsHandlerUploadGET(jc jape.Context) {
 
 func (b *bus) consensusState() api.ConsensusState {
 	cs := b.cm.TipState()
-
 	var synced bool
 	if block, ok := b.cm.Block(cs.Index.ID); ok && time.Since(block.Timestamp) < 2*cs.BlockInterval() {
 		synced = true
@@ -2396,7 +2401,7 @@ func (b *bus) multipartHandlerListPartsPOST(jc jape.Context) {
 }
 
 // New returns a new Bus.
-func New(am *alerts.Manager, hm WebhookManager, cm ChainManager, s Syncer, w Wallet, hdb HostDB, as AutopilotStore, ms MetadataStore, ss SettingStore, eas EphemeralAccountStore, mtrcs MetricsStore, l *zap.Logger) (*bus, error) {
+func New(am *alerts.Manager, hm WebhookManager, cm ChainManager, s Syncer, w Wallet, hdb HostDB, as AutopilotStore, cs ChainStore, ms MetadataStore, ss SettingStore, eas EphemeralAccountStore, mtrcs MetricsStore, l *zap.Logger) (*bus, error) {
 	b := &bus{
 		alerts:           alerts.WithOrigin(am, "bus"),
 		alertMgr:         am,

bus/client/client_test.go

@@ -70,7 +70,7 @@ func newTestClient(dir string) (*client.Client, func() error, func(context.Conte
 
 	// create bus
 	network, genesis := build.Network()
-	b, shutdown, _, err := node.NewBus(node.BusConfig{
+	b, shutdown, _, _, err := node.NewBus(node.BusConfig{
 		Bus: config.Bus{
 			AnnouncementMaxAgeHours:       24 * 7 * 52, // 1 year
 			Bootstrap:                     false,

chain/manager.go

@@ -0,0 +1,24 @@
+package chain
+
+import (
+	"go.sia.tech/core/consensus"
+	"go.sia.tech/core/types"
+	"go.sia.tech/coreutils/chain"
+)
+
+type (
+	Manager          = chain.Manager
+	HostAnnouncement = chain.HostAnnouncement
+)
+
+func TestnetZen() (*consensus.Network, types.Block) {
+	return chain.TestnetZen()
+}
+
+func NewDBStore(db chain.DB, n *consensus.Network, genesisBlock types.Block) (_ *chain.DBStore, _ consensus.State, err error) {
+	return chain.NewDBStore(db, n, genesisBlock)
+}
+
+func NewManager(store chain.Store, cs consensus.State) *Manager {
+	return chain.NewManager(store, cs)
+}