restore expected_clients

bbnclient/bbnclient.go

@@ -12,8 +12,6 @@ type BabylonClient struct {
 	*query.QueryClient
 }
 
-var _ IBabylonClient = &BabylonClient{}
-
 //////////////////////////////
 // CONSTRUCTOR
 //////////////////////////////

btcclient/btcclient.go

@@ -16,8 +16,6 @@ type BitcoinClient struct {
 	cfg    *BTCConfig
 }
 
-var _ IBitcoinClient = &BitcoinClient{}
-
 //////////////////////////////
 // CONSTRUCTOR
 //////////////////////////////

cwclient/cwclient.go

@@ -16,8 +16,6 @@ type CosmWasmClient struct {
 	contractAddr string
 }
 
-var _ ICosmWasmClient = &CosmWasmClient{}
-
 const (
 	// hardcode the timeout to 20 seconds. We can expose it to the params once needed
 	DefaultTimeout = 20 * time.Second

ethl2client/ethl2client.go

@@ -9,8 +9,6 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 )
 
-var _ IEthL2Client = &EthL2Client{}
-
 type EthL2Client struct {
 	client *ethclient.Client
 }

finalitygadget/expected_clients.go

@@ -0,0 +1,37 @@
+package finalitygadget
+
+import (
+	"context"
+	"math/big"
+
+	"github.com/babylonlabs-io/finality-gadget/types"
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
+	"github.com/btcsuite/btcd/wire"
+	eth "github.com/ethereum/go-ethereum/core/types"
+)
+
+type IBitcoinClient interface {
+	GetBlockCount() (uint64, error)
+	GetBlockHashByHeight(height uint64) (*chainhash.Hash, error)
+	GetBlockHeaderByHash(blockHash *chainhash.Hash) (*wire.BlockHeader, error)
+	GetBlockHeightByTimestamp(targetTimestamp uint64) (uint64, error)
+	GetBlockTimestampByHeight(height uint64) (uint64, error)
+}
+
+type IBabylonClient interface {
+	QueryAllFpBtcPubKeys(consumerId string) ([]string, error)
+	QueryFpPower(fpPubkeyHex string, btcHeight uint64) (uint64, error)
+	QueryMultiFpPower(fpPubkeyHexList []string, btcHeight uint64) (map[string]uint64, error)
+	QueryEarliestActiveDelBtcHeight(fpPubkeyHexList []string) (uint64, error)
+}
+
+type ICosmWasmClient interface {
+	QueryListOfVotedFinalityProviders(queryParams *types.Block) ([]string, error)
+	QueryConsumerId() (string, error)
+	QueryIsEnabled() (bool, error)
+}
+
+type IEthL2Client interface {
+	HeaderByNumber(ctx context.Context, number *big.Int) (*eth.Header, error)
+	Close()
+}

finalitygadget/finalitygadget.go

@@ -28,10 +28,10 @@ import (
 var _ IFinalityGadget = &FinalityGadget{}
 
 type FinalityGadget struct {
-	btcClient btcclient.IBitcoinClient
-	bbnClient bbnclient.IBabylonClient
-	cwClient  cwclient.ICosmWasmClient
-	l2Client  ethl2client.IEthL2Client
+	btcClient IBitcoinClient
+	bbnClient IBabylonClient
+	cwClient  ICosmWasmClient
+	l2Client  IEthL2Client
 
 	db     db.IDatabaseHandler
 	logger *zap.Logger
@@ -62,7 +62,7 @@ func NewFinalityGadget(cfg *config.Config, db db.IDatabaseHandler, logger *zap.L
 	// Create bitcoin client
 	btcConfig := btcclient.DefaultBTCConfig()
 	btcConfig.RPCHost = cfg.BitcoinRPCHost
-	var btcClient btcclient.IBitcoinClient
+	var btcClient IBitcoinClient
 	switch cfg.BBNChainID {
 	// TODO: once we set up our own local BTC devnet, we don't need to use this mock BTC client
 	case config.BabylonLocalnetChainID: