use []types.Account as GetBalances() input

forbole · Dec 20, 2022 · ce900d6 · ce900d6
1 parent 7e49b46
commit ce900d6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/modules/bank/source/local/source.go b/modules/bank/source/local/source.go
@@ -33,26 +33,26 @@ func NewSource(source *local.Source, bk banktypes.QueryServer) *Source {
 }
 
 // GetBalances implements bankkeeper.Source
-func (s Source) GetBalances(addresses []string, height int64) ([]types.NativeTokenAmount, error) {
+func (s Source) GetBalances(accounts []types.Account, height int64) ([]types.NativeTokenAmount, error) {
 	ctx, err := s.LoadHeight(height)
 	if err != nil {
 		return nil, fmt.Errorf("error while loading height: %s", err)
 	}
 
 	var balances []types.NativeTokenAmount
-	for _, address := range addresses {
+	for _, a := range accounts {
 		balRes, err := s.q.Balance(
 			sdk.WrapSDKContext(ctx),
 			&banktypes.QueryBalanceRequest{
-				Address: address,
+				Address: a.Address,
 				Denom:   pricefeed.GetDenom(),
 			})
 		if err != nil {
 			return nil, fmt.Errorf("error while getting all balances: %s", err)
 		}
 
 		balances = append(balances, types.NewNativeTokenAmount(
-			address,
+			a.Address,
 			balRes.Balance.Amount,
 			height,
 		))

diff --git a/modules/bank/source/remote/source.go b/modules/bank/source/remote/source.go
@@ -31,21 +31,21 @@ func NewSource(source *remote.Source, bankClient banktypes.QueryClient) *Source
 }
 
 // GetBalances implements bankkeeper.Source
-func (s Source) GetBalances(addresses []string, height int64) ([]types.NativeTokenAmount, error) {
+func (s Source) GetBalances(accounts []types.Account, height int64) ([]types.NativeTokenAmount, error) {
 	ctx := remote.GetHeightRequestContext(s.Ctx, height)
 
 	var balances []types.NativeTokenAmount
-	for _, address := range addresses {
+	for _, a := range accounts {
 		balRes, err := s.bankClient.Balance(ctx, &banktypes.QueryBalanceRequest{
-			Address: address,
+			Address: a.Address,
 			Denom:   pricefeed.GetDenom(),
 		})
 		if err != nil {
 			return nil, fmt.Errorf("error while getting all balances: %s", err)
 		}
 
 		balances = append(balances, types.NewNativeTokenAmount(
-			address,
+			a.Address,
 			balRes.Balance.Amount,
 			height,
 		))

diff --git a/modules/bank/source/source.go b/modules/bank/source/source.go
@@ -7,7 +7,7 @@ import (
 )
 
 type Source interface {
-	GetBalances(addresses []string, height int64) ([]types.NativeTokenAmount, error)
+	GetBalances(accounts []types.Account, height int64) ([]types.NativeTokenAmount, error)
 	GetSupply(height int64) (sdk.Coins, error)
 
 	// -- For hasura action --

diff --git a/modules/bank/utils_update_balances.go b/modules/bank/utils_update_balances.go
@@ -3,15 +3,16 @@ package bank
 import (
 	"fmt"
 
+	"github.com/forbole/bdjuno/v3/types"
 	"github.com/rs/zerolog/log"
 )
 
 // UpdateBalances updates the balances of the accounts having the given addresses,
 // taking the data at the provided height
-func (m *Module) UpdateBalances(addresses []string, height int64) error {
+func (m *Module) UpdateBalances(accounts []types.Account, height int64) error {
 	log.Debug().Str("module", "bank").Int64("height", height).Msg("updating balances")
 
-	balances, err := m.keeper.GetBalances(addresses, height)
+	balances, err := m.keeper.GetBalances(accounts, height)
 	if err != nil {
 		return fmt.Errorf("error while getting account balances: %s", err)
 	}