Merge pull request #27 from Brahma-fi/ft-fix-exports

simplify interfaces and move to types

.golangci.yml

@@ -21,7 +21,6 @@ linters:
     - staticcheck
     - bidichk
     - durationcheck
-    - exportloopref
     - whitespace
     - revive # only certain checks enabled
     - nilerr # finds the code that returns nil even if it checks that the error is not nil

gasestimate/gas_estimate.go

@@ -39,14 +39,6 @@ type ethClientFactory interface {
 	Client(chainID int64) (*ethclient.Client, error)
 }
 
-type addressProvider interface {
-	GetAddress(key string) (common.Address, error)
-}
-
-type addressRegistry interface {
-	AddressProvider(chainID int64) (addressProvider, error)
-}
-
 type estimateGasResponse struct {
 	Jsonrpc string `json:"jsonrpc"`
 	ID      int    `json:"id"`
@@ -78,7 +70,7 @@ type estimateGasRequest struct {
 
 type Estimation struct {
 	clientFactory   ethClientFactory
-	addressRegistry addressRegistry
+	addressRegistry types.AddressRegistry
 
 	safeAbi     *abi.ABI
 	accessorAbi *abi.ABI
@@ -88,7 +80,7 @@ type Estimation struct {
 
 func NewGasEstimation(
 	clientFactory ethClientFactory,
-	addRegistry addressRegistry,
+	addRegistry types.AddressRegistry,
 
 	safeAbi *abi.ABI,
 	accessorAbi *abi.ABI,
@@ -196,16 +188,10 @@ func (g *Estimation) EstimateSafeGasv1_3_0(ctx context.Context, safeTxn *types.S
 func (g *Estimation) EstimateSafeGasv1_4_0(_ context.Context, safeTxn *types.SafeTx) (uint64, error) {
 	chainID := (*big.Int)(safeTxn.ChainId).Int64()
 
-	addressProvider, err := g.addressRegistry.AddressProvider(chainID)
+	simAddress, err := g.addressRegistry.GetAddressByChainID(chainID, SimulateTxnAccessor)
 	if err != nil {
 		return 0, err
 	}
-
-	simAddress, err := addressProvider.GetAddress(SimulateTxnAccessor)
-	if err != nil {
-		return 0, err
-	}
-
 	safeAddress := safeTxn.Safe.Address()
 	//nolint:lll
 	// see https://github.com/safe-global/safe-contracts/blob/7a77545f288361893313af23194988731ee95261/test/accessors/SimulateTxAccessor.spec.ts#L70

metadata/safe_metadata.go

@@ -26,17 +26,17 @@ var (
 )
 
 type SafeMetadataService struct {
-	addressRegistry addressRegistry
-	multiCaller     multiCaller
+	addressRegistry types.AddressRegistry
+	multiCaller     types.MultiCaller
 
 	safeAbi           *abi.ABI
 	walletRegistryAbi *abi.ABI
 	re                *regexp.Regexp
 }
 
 func NewSafeMetadataService(
-	addrRegistry addressRegistry,
-	mc multiCaller,
+	addrRegistry types.AddressRegistry,
+	mc types.MultiCaller,
 ) (*SafeMetadataService, error) {
 	walletRegistryAbi, err := abi.JSON(strings.NewReader(walletregistry.WalletregistryMetaData.ABI))
 	if err != nil {
@@ -214,12 +214,7 @@ func (s *SafeMetadataService) GetSafeMetadata(
 	safes []common.Address,
 	chainID int64,
 ) ([]types.Metadata, error) {
-	provider, err := s.addressRegistry.AddressProvider(chainID)
-	if err != nil {
-		return nil, err
-	}
-
-	walletRegistry, err := provider.GetAddress(WalletRegistryAddress)
+	walletRegistry, err := s.addressRegistry.GetAddressByChainID(chainID, WalletRegistryAddress)
 	if err != nil {
 		return nil, err
 	}

metadata/interfaces.go → types/interfaces.go

@@ -1,4 +1,4 @@
-package metadata
+package types
 
 import (
 	"context"
@@ -8,15 +8,11 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-type addressProvider interface {
-	GetAddress(key string) (common.Address, error)
+type AddressRegistry interface {
+	GetAddressByChainID(chainID int64, key string) (common.Address, error)
 }
 
-type addressRegistry interface {
-	AddressProvider(chainID int64) (addressProvider, error)
-}
-
-type multiCaller interface {
+type MultiCaller interface {
 	Aggregate3(
 		ctx context.Context,
 		calls []multicall.Multicall3Call3,