account tool bugfix

multiversx · Oct 25, 2024 · 2cd0255 · 2cd0255
1 parent 536ecb4
commit 2cd0255
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/framework/scenario/src/scenario/model/value/value_key_bytes.rs b/framework/scenario/src/scenario/model/value/value_key_bytes.rs
@@ -14,6 +14,15 @@ pub struct BytesKey {
     pub original: String,
 }
 
+impl BytesKey {
+    pub fn from_hex(hex_value: &str) -> Self {
+        Self {
+            value: hex::decode(hex_value).expect("could not decode hex value"),
+            original: format!("0x{hex_value}"),
+        }
+    }
+}
+
 impl From<Vec<u8>> for BytesKey {
     fn from(v: Vec<u8>) -> Self {
         BytesKey {

diff --git a/framework/scenario/src/scenario/model/value/value_set_bytes.rs b/framework/scenario/src/scenario/model/value/value_set_bytes.rs
@@ -23,6 +23,13 @@ impl BytesValue {
             original: ValueSubTree::Str(String::default()),
         }
     }
+
+    pub fn from_hex(hex_value: &str) -> Self {
+        Self {
+            value: hex::decode(hex_value).expect("could not decode hex value"),
+            original: ValueSubTree::Str(format!("0x{hex_value}")),
+        }
+    }
 }
 
 impl InterpretableFrom<ValueSubTree> for BytesValue {

diff --git a/framework/snippets-base/src/account_tool.rs b/framework/snippets-base/src/account_tool.rs
@@ -90,7 +90,7 @@ fn set_account(
     let mut account_state = Account::new()
         .nonce(account.nonce)
         .balance(account.balance.as_str())
-        .code(account.code);
+        .code(BytesValue::from_hex(&account.code));
     account_state.username = Some(format!("str:{}", account.username.as_str()).into());
     account_state.storage = convert_storage(account_storage);
 
@@ -112,6 +112,6 @@ fn convert_storage(account_storage: HashMap<String, String>) -> BTreeMap<BytesKe
     account_storage
         .into_iter()
         .filter(|(k, _)| !k.starts_with("454c524f4e44"))
-        .map(|(k, v)| (BytesKey::from(k.as_str()), BytesValue::from(v)))
+        .map(|(k, v)| (BytesKey::from_hex(&k), BytesValue::from_hex(&v)))
         .collect()
 }