From 2f61ad01a4049a4476673b066db3d5bf6c3a9096 Mon Sep 17 00:00:00 2001
From: krehermann <keith.rehermann@smartcontract.com>
Date: Thu, 24 Aug 2023 09:54:04 -0600
Subject: [PATCH] BCF-2564: update the relayer to use a chain rather than
 chainset (#320)

---
 relayer/pkg/chainlink/chain/chain.go |  1 +
 relayer/pkg/chainlink/relay.go       | 34 ++++++++++------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/relayer/pkg/chainlink/chain/chain.go b/relayer/pkg/chainlink/chain/chain.go
index b51678282..7268ce271 100644
--- a/relayer/pkg/chainlink/chain/chain.go
+++ b/relayer/pkg/chainlink/chain/chain.go
@@ -16,6 +16,7 @@ type ChainSet = types.ChainSet[string, Chain]
 type Chain interface {
 	types.ChainService
 
+	ID() string
 	Config() config.Config
 
 	TxManager() txm.TxManager
diff --git a/relayer/pkg/chainlink/relay.go b/relayer/pkg/chainlink/relay.go
index 061649cc7..8e235ad80 100644
--- a/relayer/pkg/chainlink/relay.go
+++ b/relayer/pkg/chainlink/relay.go
@@ -16,21 +16,21 @@ import (
 var _ relaytypes.Relayer = (*relayer)(nil)
 
 type relayer struct {
-	chainSet starkchain.ChainSet
-	ctx      context.Context
+	chain starkchain.Chain
+	ctx   context.Context
 
 	lggr logger.Logger
 
 	cancel func()
 }
 
-func NewRelayer(lggr logger.Logger, chainSet starkchain.ChainSet) *relayer {
+func NewRelayer(lggr logger.Logger, chain starkchain.Chain) *relayer {
 	ctx, cancel := context.WithCancel(context.Background())
 	return &relayer{
-		chainSet: chainSet,
-		ctx:      ctx,
-		lggr:     lggr,
-		cancel:   cancel,
+		chain:  chain,
+		ctx:    ctx,
+		lggr:   lggr,
+		cancel: cancel,
 	}
 }
 
@@ -48,7 +48,7 @@ func (r *relayer) Close() error {
 }
 
 func (r *relayer) Ready() error {
-	return r.chainSet.Ready()
+	return r.chain.Ready()
 }
 
 func (r *relayer) Healthy() error { return nil }
@@ -65,16 +65,11 @@ func (r *relayer) NewConfigProvider(args relaytypes.RelayArgs) (relaytypes.Confi
 		return nil, errors.Wrap(err, "couldn't unmarshal RelayConfig")
 	}
 
-	chain, err := r.chainSet.Chain(r.ctx, relayConfig.ChainID)
-	if err != nil {
-		return nil, errors.Wrap(err, "couldn't initilize Chain")
-	}
-
-	reader, err := chain.Reader()
+	reader, err := r.chain.Reader()
 	if err != nil {
 		return nil, errors.Wrap(err, "error in NewConfigProvider chain.Reader")
 	}
-	configProvider, err := ocr2.NewConfigProvider(relayConfig.ChainID, args.ContractID, reader, chain.Config(), r.lggr)
+	configProvider, err := ocr2.NewConfigProvider(r.chain.ID(), args.ContractID, reader, r.chain.Config(), r.lggr)
 	if err != nil {
 		return nil, errors.Wrap(err, "coudln't initialize ConfigProvider")
 	}
@@ -94,17 +89,12 @@ func (r *relayer) NewMedianProvider(rargs relaytypes.RelayArgs, pargs relaytypes
 		return nil, errors.New("no account address in relay config")
 	}
 
-	chain, err := r.chainSet.Chain(r.ctx, relayConfig.ChainID)
-	if err != nil {
-		return nil, errors.Wrap(err, "couldn't initilize Chain")
-	}
-
 	// todo: use pargs for median provider
-	reader, err := chain.Reader()
+	reader, err := r.chain.Reader()
 	if err != nil {
 		return nil, errors.Wrap(err, "error in NewMedianProvider chain.Reader")
 	}
-	medianProvider, err := ocr2.NewMedianProvider(relayConfig.ChainID, rargs.ContractID, pargs.TransmitterID, relayConfig.AccountAddress, reader, chain.Config(), chain.TxManager(), r.lggr)
+	medianProvider, err := ocr2.NewMedianProvider(r.chain.ID(), rargs.ContractID, pargs.TransmitterID, relayConfig.AccountAddress, reader, r.chain.Config(), r.chain.TxManager(), r.lggr)
 	if err != nil {
 		return nil, errors.Wrap(err, "couldn't initilize MedianProvider")
 	}