Merge branch 'master' into illia-malachyn/767-block-payload-response-…

…object
onflow · Nov 5, 2024 · 5a42ecd · 5a42ecd
2 parents 8a3527c + 5b17d2d
commit 5a42ecd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/access/grpc/client.go b/access/grpc/client.go
@@ -239,11 +239,11 @@ func (c *Client) GetAccountKeyAtBlockHeight(ctx context.Context, address flow.Ad
 	return c.grpc.GetAccountKeyAtBlockHeight(ctx, address, keyIndex, height)
 }
 
-func (c *Client) GetAccountKeysAtLatestBlock(ctx context.Context, address flow.Address) ([]flow.AccountKey, error) {
+func (c *Client) GetAccountKeysAtLatestBlock(ctx context.Context, address flow.Address) ([]*flow.AccountKey, error) {
 	return c.grpc.GetAccountKeysAtLatestBlock(ctx, address)
 }
 
-func (c *Client) GetAccountKeysAtBlockHeight(ctx context.Context, address flow.Address, height uint64) ([]flow.AccountKey, error) {
+func (c *Client) GetAccountKeysAtBlockHeight(ctx context.Context, address flow.Address, height uint64) ([]*flow.AccountKey, error) {
 	return c.grpc.GetAccountKeysAtBlockHeight(ctx, address, height)
 }
 

diff --git a/access/grpc/convert/convert.go b/access/grpc/convert/convert.go
@@ -150,16 +150,16 @@ func MessageToAccountKey(m *entities.AccountKey) (*flow.AccountKey, error) {
 	}, nil
 }
 
-func MessageToAccountKeys(m []*entities.AccountKey) ([]flow.AccountKey, error) {
-	var accountKeys []flow.AccountKey
+func MessageToAccountKeys(m []*entities.AccountKey) ([]*flow.AccountKey, error) {
+	var accountKeys []*flow.AccountKey
 
 	for _, entity := range m {
 		accountKey, err := MessageToAccountKey(entity)
 		if err != nil {
 			return nil, err
 		}
 
-		accountKeys = append(accountKeys, *accountKey)
+		accountKeys = append(accountKeys, accountKey)
 	}
 
 	return accountKeys, nil

diff --git a/access/grpc/grpc.go b/access/grpc/grpc.go
@@ -704,7 +704,7 @@ func (c *BaseClient) GetAccountKeyAtBlockHeight(
 func (c *BaseClient) GetAccountKeysAtLatestBlock(
 	ctx context.Context,
 	address flow.Address,
-) ([]flow.AccountKey, error) {
+) ([]*flow.AccountKey, error) {
 	request := &access.GetAccountKeysAtLatestBlockRequest{
 		Address: address.Bytes(),
 	}
@@ -726,7 +726,7 @@ func (c *BaseClient) GetAccountKeysAtBlockHeight(
 	ctx context.Context,
 	address flow.Address,
 	height uint64,
-) ([]flow.AccountKey, error) {
+) ([]*flow.AccountKey, error) {
 	request := &access.GetAccountKeysAtBlockHeightRequest{
 		Address:     address.Bytes(),
 		BlockHeight: height,

diff --git a/access/grpc/grpc_test.go b/access/grpc/grpc_test.go
@@ -1069,7 +1069,7 @@ func TestClient_GetAccountKeysAtLatestBlock(t *testing.T) {
 
 		keys, err := c.GetAccountKeysAtLatestBlock(ctx, account.Address)
 		require.NoError(t, err)
-		assert.Equal(t, *account.Keys[index], keys[index])
+		assert.Equal(t, *account.Keys[index], *keys[index])
 	}))
 
 	t.Run("Not found error", clientTest(func(t *testing.T, ctx context.Context, rpc *mocks.MockRPCClient, c *BaseClient) {
@@ -1105,7 +1105,7 @@ func TestClient_GetAccountKeysAtBlockHeight(t *testing.T) {
 
 		keys, err := c.GetAccountKeysAtBlockHeight(ctx, account.Address, height)
 		require.NoError(t, err)
-		assert.Equal(t, *account.Keys[index], keys[index])
+		assert.Equal(t, *account.Keys[index], *keys[index])
 	}))
 
 	t.Run("Not found error", clientTest(func(t *testing.T, ctx context.Context, rpc *mocks.MockRPCClient, c *BaseClient) {