Rename EngineState::to_bytes -> EngineState::borsh_serialize

aurora-is-near · May 10, 2023 · b1015b0 · b1015b0
1 parent 0c4e62d
commit b1015b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/engine-tests/src/tests/repro.rs b/engine-tests/src/tests/repro.rs
@@ -153,7 +153,9 @@ fn repro_common(context: &ReproContext) {
     let tx_bytes = hex::decode(tx_hex.trim()).unwrap();
 
     // Make a random call that touches the Engine state to force the lazy migration
-    runner.call("get_chain_id", "relay.aurora", Vec::new()).unwrap();
+    runner
+        .call("get_chain_id", "relay.aurora", Vec::new())
+        .unwrap();
     // Run benchmark post-migration
     let outcome = runner.call("submit", "relay.aurora", tx_bytes).unwrap();
     let profile = ExecutionProfile::new(&outcome);

diff --git a/engine-tests/src/tests/sanity.rs b/engine-tests/src/tests/sanity.rs
@@ -152,7 +152,7 @@ fn test_state_format() {
         "0300000000000000",
     ]
     .concat();
-    assert_eq!(hex::encode(state.to_bytes().unwrap()), expected_hex);
+    assert_eq!(hex::encode(state.borsh_serialize().unwrap()), expected_hex);
 }
 
 fn generate_code(len: usize) -> Vec<u8> {

diff --git a/engine/src/state.rs b/engine/src/state.rs
@@ -24,7 +24,7 @@ pub struct EngineState {
 }
 
 impl EngineState {
-    pub fn to_bytes(&self) -> Result<Vec<u8>, error::EngineStateError> {
+    pub fn borsh_serialize(&self) -> Result<Vec<u8>, error::EngineStateError> {
         let borshable: BorshableEngineState = self.into();
         borshable
             .try_to_vec()
@@ -36,9 +36,7 @@ impl EngineState {
         bytes: &[u8],
         io: &I,
     ) -> Result<Self, error::EngineStateError> {
-        let borshable = if let Ok(s) = BorshableEngineState::try_from_slice(bytes) {
-            s
-        } else {
+        let Ok(borshable) = BorshableEngineState::try_from_slice(bytes) else {
             let legacy = BorshableEngineStateV1::try_from_slice(bytes)
                 .map_err(|_| EngineStateError::DeserializationFailed)?;
             let result = legacy.into();
@@ -154,7 +152,7 @@ pub fn get_state<I: IO + Copy>(io: &I) -> Result<EngineState, error::EngineState
 pub fn set_state<I: IO>(io: &mut I, state: &EngineState) -> Result<(), EngineStateError> {
     io.write_storage(
         &bytes_to_key(KeyPrefix::Config, STATE_KEY),
-        &state.to_bytes()?,
+        &state.borsh_serialize()?,
     );
 
     Ok(())