Make tests compatible with the "request id" related change

casper-network · May 27, 2024 · 927e06f · 927e06f
1 parent 21a46c4
commit 927e06f
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 7 deletions.
diff --git a/rpc_sidecar/src/node_client.rs b/rpc_sidecar/src/node_client.rs
@@ -15,8 +15,8 @@ use std::{
 use tokio_util::codec::Framed;
 
 use casper_binary_port::{
-    BalanceResponse, BinaryMessage, BinaryMessageCodec, BinaryRequest, BinaryRequestHeader,
-    BinaryResponse, BinaryResponseAndRequest, ConsensusValidatorChanges, DictionaryItemIdentifier,
+    BalanceResponse, BinaryMessage, BinaryMessageCodec, BinaryRequest, BinaryResponse,
+    BinaryResponseAndRequest, ConsensusValidatorChanges, DictionaryItemIdentifier,
     DictionaryQueryResult, ErrorCode, GetRequest, GetTrieFullResult, GlobalStateQueryResult,
     GlobalStateRequest, InformationRequest, KeyPrefix, NodeStatus, PayloadEntity, PurseIdentifier,
     RecordId, SpeculativeExecutionResult, TransactionWithExecutionInfo,
@@ -912,6 +912,7 @@ mod tests {
     };
 
     use super::*;
+    use casper_binary_port::BinaryRequestHeader;
     use casper_types::testing::TestRng;
     use casper_types::{CLValue, SemVer};
     use futures::FutureExt;
@@ -928,6 +929,7 @@ mod tests {
             BinaryResponseAndRequest::new(
                 BinaryResponse::from_value(AvailableBlockRange::RANGE_0_0, bad_version),
                 &request,
+                0,
             ),
             0,
             &notify,
@@ -951,6 +953,7 @@ mod tests {
             BinaryResponseAndRequest::new(
                 BinaryResponse::from_value(AvailableBlockRange::RANGE_0_0, version),
                 &request,
+                0,
             ),
             0,
             &notify,
@@ -960,7 +963,8 @@ mod tests {
             result,
             Ok(BinaryResponseAndRequest::new(
                 BinaryResponse::from_value(AvailableBlockRange::RANGE_0_0, version),
-                &request
+                &request,
+                0
             ))
         );
         assert_eq!(notify.notified().now_or_never(), None)
@@ -980,6 +984,7 @@ mod tests {
             BinaryResponseAndRequest::new(
                 BinaryResponse::from_value(AvailableBlockRange::RANGE_0_0, version),
                 &request,
+                0,
             ),
             0,
             &notify,
@@ -989,7 +994,8 @@ mod tests {
             result,
             Ok(BinaryResponseAndRequest::new(
                 BinaryResponse::from_value(AvailableBlockRange::RANGE_0_0, version),
-                &request
+                &request,
+                0
             ))
         );
         assert_eq!(notify.notified().now_or_never(), None)
@@ -1149,7 +1155,7 @@ mod tests {
 
         let req = get_dummy_request_payload(Some(actual_id));
         let resp = BinaryResponse::new_empty(ProtocolVersion::V2_0_0);
-        let resp_and_req = BinaryResponseAndRequest::new(resp, &req);
+        let resp_and_req = BinaryResponseAndRequest::new(resp, &req, actual_id);
 
         let result = validate_response(resp_and_req, expected_id, &notify);
         assert!(matches!(
@@ -1162,7 +1168,7 @@ mod tests {
 
         let req = get_dummy_request_payload(Some(actual_id));
         let resp = BinaryResponse::new_empty(ProtocolVersion::V2_0_0);
-        let resp_and_req = BinaryResponseAndRequest::new(resp, &req);
+        let resp_and_req = BinaryResponseAndRequest::new(resp, &req, actual_id);
 
         let result = validate_response(resp_and_req, expected_id, &notify);
         assert!(matches!(
@@ -1180,7 +1186,7 @@ mod tests {
 
         let req = get_dummy_request_payload(Some(actual_id));
         let resp = BinaryResponse::new_empty(ProtocolVersion::V2_0_0);
-        let resp_and_req = BinaryResponseAndRequest::new(resp, &req);
+        let resp_and_req = BinaryResponseAndRequest::new(resp, &req, actual_id);
 
         let result = validate_response(resp_and_req, expected_id, &notify);
         dbg!(&result);

diff --git a/rpc_sidecar/src/rpcs/account.rs b/rpc_sidecar/src/rpcs/account.rs
@@ -172,6 +172,7 @@ mod tests {
                         Ok(BinaryResponseAndRequest::new(
                             BinaryResponse::new_empty(SUPPORTED_PROTOCOL_VERSION),
                             &[],
+                            0,
                         ))
                     }
                     _ => unimplemented!(),
@@ -213,6 +214,7 @@ mod tests {
                         Ok(BinaryResponseAndRequest::new(
                             BinaryResponse::new_empty(SUPPORTED_PROTOCOL_VERSION),
                             &[],
+                            0,
                         ))
                     }
                     _ => unimplemented!(),
@@ -257,6 +259,7 @@ mod tests {
                                 SUPPORTED_PROTOCOL_VERSION,
                             ),
                             &[],
+                            0,
                         ))
                     }
                     _ => unimplemented!(),

diff --git a/rpc_sidecar/src/rpcs/chain.rs b/rpc_sidecar/src/rpcs/chain.rs
@@ -704,6 +704,7 @@ mod tests {
                     Ok(BinaryResponseAndRequest::new(
                         BinaryResponse::from_value(self.block.clone(), SUPPORTED_PROTOCOL_VERSION),
                         &[],
+                        0,
                     ))
                 }
                 BinaryRequest::Get(GetRequest::Information { info_type_tag, .. })
@@ -716,6 +717,7 @@ mod tests {
                             SUPPORTED_PROTOCOL_VERSION,
                         ),
                         &[],
+                        0,
                     ))
                 }
                 BinaryRequest::Get(GetRequest::Record {
@@ -758,6 +760,7 @@ mod tests {
                             SUPPORTED_PROTOCOL_VERSION,
                         ),
                         &[],
+                        0,
                     ))
                 }
                 BinaryRequest::Get(GetRequest::State(req))
@@ -778,6 +781,7 @@ mod tests {
                             SUPPORTED_PROTOCOL_VERSION,
                         ),
                         &[],
+                        0,
                     ))
                 }
                 req => unimplemented!("unexpected request: {:?}", req),

diff --git a/rpc_sidecar/src/rpcs/info.rs b/rpc_sidecar/src/rpcs/info.rs
@@ -757,6 +757,7 @@ mod tests {
                     Ok(BinaryResponseAndRequest::new(
                         BinaryResponse::from_value(transaction, SUPPORTED_PROTOCOL_VERSION),
                         &[],
+                        0,
                     ))
                 }
                 req => unimplemented!("unexpected request: {:?}", req),

diff --git a/rpc_sidecar/src/rpcs/speculative_exec.rs b/rpc_sidecar/src/rpcs/speculative_exec.rs
@@ -246,6 +246,7 @@ mod tests {
                             SUPPORTED_PROTOCOL_VERSION,
                         ),
                         &[],
+                        0,
                     ))
                 }
                 BinaryRequest::TrySpeculativeExec { .. } => Ok(BinaryResponseAndRequest::new(
@@ -254,6 +255,7 @@ mod tests {
                         SUPPORTED_PROTOCOL_VERSION,
                     ),
                     &[],
+                    0,
                 )),
                 req => unimplemented!("unexpected request: {:?}", req),
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -757,6 +757,7 @@ mod tests { @@
                         Ok(BinaryResponseAndRequest::new(
                             BinaryResponse::from_value(transaction, SUPPORTED_PROTOCOL_VERSION),
                             &[],
+,
                         ))
                     }
                     req => unimplemented!("unexpected request: {:?}", req),
@@ Expand Down @@