Merge branch 'master' into illia-malachyn/784-add-more-examples

onflow · Nov 5, 2024 · 526381d · 526381d
2 parents 5367639 + 5b17d2d
commit 526381d
Show file tree

Hide file tree

Showing 33 changed files with 502 additions and 684 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
@@ -347,12 +347,16 @@ func QuorumCertificateToMessage(qc flow.QuorumCertificate) (*entities.QuorumCert
 	}, nil
 }
 
-func MessageToBlockDigest(m *access.SubscribeBlockDigestsResponse) flow.BlockDigest {
+func MessageToBlockDigest(m *access.SubscribeBlockDigestsResponse) (flow.BlockDigest, error) {
+	if m == nil {
+		return flow.BlockDigest{}, ErrEmptyMessage
+	}
+
 	return flow.BlockDigest{
 		BlockID:   flow.BytesToID(m.GetBlockId()),
 		Height:    m.GetBlockHeight(),
 		Timestamp: m.GetBlockTimestamp().AsTime(),
-	}
+	}, nil
 }
 
 func BlockDigestToMessage(blockDigest flow.BlockDigest) *access.SubscribeBlockDigestsResponse {