address comments; fix or document TODOs; revert test changes; move/re…

…name code for clarity

core/chains/config.go

@@ -1,9 +1,19 @@
 package chains
 
 import (
+	"context"
+	"errors"
+
+	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
 	"github.com/smartcontractkit/chainlink-relay/pkg/types"
 )
 
+var (
+	// ErrChainIDEmpty is returned when chain is required but was empty.
+	ErrChainIDEmpty = errors.New("chain id empty")
+	ErrNotFound     = errors.New("not found")
+)
+
 type ChainConfigs interface {
 	Chains(offset, limit int, ids ...string) ([]types.ChainStatus, int, error)
 }
@@ -13,11 +23,30 @@ type NodeConfigs[I ID, N Node] interface {
 	Nodes(chainID I) (nodes []N, err error)
 
 	NodeStatus(name string) (types.NodeStatus, error)
-	NodeStatusesPaged(offset, limit int, chainIDs ...string) (nodes []types.NodeStatus, count int, err error)
 }
 
 // Configs holds chain and node configurations.
+// TODO: BCF-2605 audit the usage of this interface and potentially remove it
 type Configs[I ID, N Node] interface {
 	ChainConfigs
 	NodeConfigs[I, N]
 }
+
+// ChainStatuser is a generic interface for chain configuration.
+type ChainStatuser interface {
+	// must return [ErrNotFound] if the id is not found
+	ChainStatus(ctx context.Context, id string) (types.ChainStatus, error)
+	ChainStatuses(ctx context.Context, offset, limit int) ([]types.ChainStatus, int, error)
+}
+
+// NodesStatuser is an interface for node configuration and state.
+// TODO BCF-2440, BCF-2511 may need Node(ctx,name) to get a node status by name
+type NodesStatuser interface {
+	NodeStatuses(ctx context.Context, offset, limit int, chainIDs ...string) (nodes []types.NodeStatus, count int, err error)
+}
+
+// ChainOpts holds options for configuring a Chain
+type ChainOpts[I ID, N Node] interface {
+	Validate() error
+	ConfigsAndLogger() (Configs[I, N], logger.Logger)
+}

core/chains/cosmos/chain.go

@@ -39,6 +39,66 @@ import (
 // TODO(BCI-979): Remove this, or make this configurable with the updated client.
 const DefaultRequestTimeout = 30 * time.Second
 
+var (
+	// ErrChainIDEmpty is returned when chain is required but was empty.
+	ErrChainIDEmpty = errors.New("chain id empty")
+	// ErrChainIDInvalid is returned when a chain id does not match any configured chains.
+	ErrChainIDInvalid = errors.New("chain id does not match any local chains")
+)
+
+// Chain is a wrap for easy use in other places in the core node
+type Chain = adapters.Chain
+
+// ChainOpts holds options for configuring a Chain.
+type ChainOpts struct {
+	QueryConfig      pg.QConfig
+	Logger           logger.Logger
+	DB               *sqlx.DB
+	KeyStore         keystore.Cosmos
+	EventBroadcaster pg.EventBroadcaster
+	Configs          types.Configs
+}
+
+func (o *ChainOpts) Validate() (err error) {
+	required := func(s string) error {
+		return fmt.Errorf("%s is required", s)
+	}
+	if o.QueryConfig == nil {
+		err = multierr.Append(err, required("Config"))
+	}
+	if o.Logger == nil {
+		err = multierr.Append(err, required("Logger'"))
+	}
+	if o.DB == nil {
+		err = multierr.Append(err, required("DB"))
+	}
+	if o.KeyStore == nil {
+		err = multierr.Append(err, required("KeyStore"))
+	}
+	if o.EventBroadcaster == nil {
+		err = multierr.Append(err, required("EventBroadcaster"))
+	}
+	if o.Configs == nil {
+		err = multierr.Append(err, required("Configs"))
+	}
+	return
+}
+
+func (o *ChainOpts) ConfigsAndLogger() (chains.Configs[string, db.Node], logger.Logger) {
+	return o.Configs, o.Logger
+}
+
+func NewChain(cfg *CosmosConfig, opts ChainOpts) (adapters.Chain, error) {
+	if !cfg.IsEnabled() {
+		return nil, fmt.Errorf("cannot create new chain with ID %s, the chain is disabled", *cfg.ChainID)
+	}
+	c, err := newChain(*cfg.ChainID, cfg, opts.DB, opts.KeyStore, opts.QueryConfig, opts.EventBroadcaster, opts.Configs, opts.Logger)
+	if err != nil {
+		return nil, err
+	}
+	return c, nil
+}
+
 var _ adapters.Chain = (*chain)(nil)
 
 type chain struct {

core/chains/cosmos/config.go

@@ -234,6 +234,7 @@ func legacyNode(n *coscfg.Node, id string) db.Node {
 
 type CosmosConfig struct {
 	ChainID *string
+	// Do not access directly. Use [IsEnabled]
 	Enabled *bool
 	coscfg.Chain
 	Nodes CosmosNodes