Merge pull request #401 from casper-network/signed-block-rename

Rename SignedBlock to BlockWithSignatures
casper-network · Jan 31, 2025 · f322aa8 · f322aa8
2 parents 55151e6 + 11c7cc3
commit f322aa8
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 57 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rpc_sidecar/src/node_client.rs b/rpc_sidecar/src/node_client.rs
@@ -33,9 +33,9 @@ use casper_types::{
     bytesrepr::{self, FromBytes, ToBytes},
     contracts::ContractPackage,
     system::auction::DelegatorKind,
-    AvailableBlockRange, BlockHash, BlockHeader, BlockIdentifier, ChainspecRawBytes, Digest,
-    GlobalStateIdentifier, Key, KeyTag, Package, Peers, ProtocolVersion, PublicKey, SignedBlock,
-    StoredValue, Transaction, TransactionHash, Transfer,
+    AvailableBlockRange, BlockHash, BlockHeader, BlockIdentifier, BlockWithSignatures,
+    ChainspecRawBytes, Digest, GlobalStateIdentifier, Key, KeyTag, Package, Peers, ProtocolVersion,
+    PublicKey, StoredValue, Transaction, TransactionHash, Transfer,
 };
 use std::{
     fmt::{self, Display, Formatter},
@@ -194,14 +194,14 @@ pub trait NodeClient: Send + Sync {
         parse_response::<BlockHeader>(&resp.into())
     }
 
-    async fn read_signed_block(
+    async fn read_block_with_signatures(
         &self,
         block_identifier: Option<BlockIdentifier>,
-    ) -> Result<Option<SignedBlock>, Error> {
+    ) -> Result<Option<BlockWithSignatures>, Error> {
         let resp = self
-            .read_info(InformationRequest::SignedBlock(block_identifier))
+            .read_info(InformationRequest::BlockWithSignatures(block_identifier))
             .await?;
-        parse_response::<SignedBlock>(&resp.into())
+        parse_response::<BlockWithSignatures>(&resp.into())
     }
 
     async fn read_transaction_with_execution_info(