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

…object
onflow · Nov 5, 2024 · 8a3527c · 8a3527c
2 parents 6b92f6a + cfbd2f5
commit 8a3527c
Show file tree

Hide file tree

Showing 32 changed files with 888 additions and 774 deletions.
diff --git a/access/grpc/convert/convert.go b/access/grpc/convert/convert.go
@@ -423,12 +423,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 {