Merge pull request #235 from coinbase/patrick/fix-utils

[utils] Update `FetcherHelper`

utils/utils.go

@@ -183,7 +183,8 @@ type FetcherHelper interface {
 		network *types.NetworkIdentifier,
 		account *types.AccountIdentifier,
 		block *types.PartialBlockIdentifier,
-	) (*types.BlockIdentifier, []*types.Amount, []*types.Coin, map[string]interface{}, *fetcher.Error)
+		currencies []*types.Currency,
+	) (*types.BlockIdentifier, []*types.Amount, map[string]interface{}, *fetcher.Error)
 }
 
 // CheckNetworkSupported checks if a Rosetta implementation supports a given
@@ -312,22 +313,23 @@ func CurrencyBalance(
 	account *types.AccountIdentifier,
 	currency *types.Currency,
 	index int64,
-) (*types.Amount, *types.BlockIdentifier, []*types.Coin, error) {
+) (*types.Amount, *types.BlockIdentifier, error) {
 	var lookupBlock *types.PartialBlockIdentifier
 	if index >= 0 {
 		lookupBlock = &types.PartialBlockIdentifier{
 			Index: &index,
 		}
 	}
 
-	liveBlock, liveBalances, liveCoins, _, fetchErr := helper.AccountBalanceRetry(
+	liveBlock, liveBalances, _, fetchErr := helper.AccountBalanceRetry(
 		ctx,
 		network,
 		account,
 		lookupBlock,
+		[]*types.Currency{currency},
 	)
 	if fetchErr != nil {
-		return nil, nil, nil, fetchErr.Err
+		return nil, nil, fetchErr.Err
 	}
 
 	liveAmount, err := types.ExtractAmount(liveBalances, currency)
@@ -339,10 +341,10 @@ func CurrencyBalance(
 			types.PrettyPrintStruct(account),
 		)
 
-		return nil, nil, nil, formattedError
+		return nil, nil, formattedError
 	}
 
-	return liveAmount, liveBlock, liveCoins, nil
+	return liveAmount, liveBlock, nil
 }
 
 // AccountBalanceRequest defines the required information
@@ -372,7 +374,7 @@ func GetAccountBalances(
 ) ([]*AccountBalance, error) {
 	var accountBalances []*AccountBalance
 	for _, balanceRequest := range balanceRequests {
-		amount, block, coins, err := CurrencyBalance(
+		amount, block, err := CurrencyBalance(
 			ctx,
 			balanceRequest.Network,
 			fetcher,
@@ -388,7 +390,6 @@ func GetAccountBalances(
 		accountBalance := &AccountBalance{
 			Account: balanceRequest.Account,
 			Amount:  amount,
-			Coins:   coins,
 			Block:   block,
 		}
 

utils/utils_test.go

@@ -270,23 +270,6 @@ var (
 		Currency: currency,
 	}
 
-	accountCoins = []*types.Coin{
-		{
-			CoinIdentifier: &types.CoinIdentifier{Identifier: "coin1"},
-			Amount: &types.Amount{
-				Value:    "30",
-				Currency: currency,
-			},
-		},
-		{
-			CoinIdentifier: &types.CoinIdentifier{Identifier: "coin2"},
-			Amount: &types.Amount{
-				Value:    "30",
-				Currency: currency,
-			},
-		},
-	}
-
 	accountBalance = &types.AccountIdentifier{
 		Address: "test2",
 	}
@@ -305,7 +288,6 @@ var (
 	accBalanceResp1 = &AccountBalance{
 		Account: accountCoin,
 		Amount:  amountCoins,
-		Coins:   accountCoins,
 		Block:   blockIdentifier,
 	}
 
@@ -333,10 +315,10 @@ func TestGetAccountBalances(t *testing.T) {
 		network,
 		accountCoin,
 		(*types.PartialBlockIdentifier)(nil),
+		[]*types.Currency{currency},
 	).Return(
 		blockIdentifier,
 		[]*types.Amount{amountCoins},
-		accountCoins,
 		nil,
 		nil,
 	).Once()
@@ -347,12 +329,12 @@ func TestGetAccountBalances(t *testing.T) {
 		network,
 		accountBalance,
 		(*types.PartialBlockIdentifier)(nil),
+		[]*types.Currency{currency},
 	).Return(
 		blockIdentifier,
 		[]*types.Amount{amountBalance},
 		nil,
 		nil,
-		nil,
 	).Once()
 
 	accBalances, err := GetAccountBalances(
@@ -372,11 +354,11 @@ func TestGetAccountBalances(t *testing.T) {
 		network,
 		accountBalance,
 		(*types.PartialBlockIdentifier)(nil),
+		[]*types.Currency{currency},
 	).Return(
 		nil,
 		nil,
 		nil,
-		nil,
 		&fetcher.Error{
 			Err: fmt.Errorf("invalid account balance"),
 		},