test fix and small error message adjustment

multiversx · Jun 26, 2024 · c3813a6 · c3813a6
1 parent ff2644e
commit c3813a6
Show file tree

Hide file tree

Showing 12 changed files with 503 additions and 276 deletions.
diff --git a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json
diff --git a/contracts/feature-tests/alloc-features/scenarios/storage_opt_address.scen.json b/contracts/feature-tests/alloc-features/scenarios/storage_opt_address.scen.json
@@ -36,7 +36,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error (key: opt_addr): input too long",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"

diff --git a/contracts/feature-tests/basic-features/scenarios/codec_err.scen.json b/contracts/feature-tests/basic-features/scenarios/codec_err.scen.json
@@ -53,7 +53,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: deliberate top decode error"
+                "message": "str:storage decode error (key: load_with_value_err): deliberate top decode error"
             }
         },
         {

diff --git a/contracts/feature-tests/basic-features/scenarios/storage_i64_bad.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_i64_bad.scen.json
@@ -33,7 +33,7 @@
             "expect": {
                 "out": [],
                 "status": "*",
-                "message": "str:storage decode error: argument out of range",
+                "message": "str:storage decode error (key: i64): argument out of range",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"

diff --git a/contracts/feature-tests/basic-features/scenarios/storage_opt_managed_addr.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_opt_managed_addr.scen.json
@@ -36,7 +36,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error (key: opt_addr): input too long",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"

diff --git a/contracts/feature-tests/basic-features/scenarios/storage_u64_bad.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_u64_bad.scen.json
@@ -33,7 +33,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error (key: u64): input too long",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"

diff --git a/contracts/feature-tests/basic-features/scenarios/storage_usize_bad.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_usize_bad.scen.json
@@ -33,7 +33,7 @@
             "expect": {
                 "out": [],
                 "status": "4",
-                "message": "str:storage decode error: input too long",
+                "message": "str:storage decode error (key: usize): input too long",
                 "logs": "*",
                 "gas": "*",
                 "refund": "*"

diff --git a/...acts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json b/...acts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json
@@ -9,30 +9,6 @@
                 }
             }
         },
-        {
-            "step": "setState",
-            "accounts": {
-                "0x00000000000000006c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": {
-                    "nonce": "0",
-                    "balance": "0",
-                    "esdt": {
-                        "str:COOL-123456": {
-                            "instances": [
-                                {
-                                    "nonce": "0",
-                                    "balance": "1000",
-                                    "royalties": "0",
-                                    "attributes": "0x"
-                                }
-                            ]
-                        }
-                    },
-                    "code": "file:../output/rust-testing-framework-tester.wasm",
-                    "codeMetadata": "0x0506",
-                    "developerRewards": "0"
-                }
-            }
-        },
         {
             "step": "checkState",
             "accounts": {

diff --git a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
@@ -2,6 +2,7 @@ use core::marker::PhantomData;
 
 use unwrap_infallible::UnwrapInfallible;
 
+use crate::api::HandleConstraints;
 use crate::codec::{TopDecode, TopEncode};
 
 use crate::{
@@ -67,7 +68,7 @@ where
 
         V::top_decode_or_handle_err(
             result_buffer,
-            StorageGetErrorHandler::<A>::new(key.get_raw_handle()),
+            StorageGetErrorHandler::<A>::new(key.get_handle().get_raw_handle_unchecked()),
         )
         .unwrap_infallible()
     }

diff --git a/framework/base/src/err_msg.rs b/framework/base/src/err_msg.rs
@@ -22,7 +22,8 @@ pub const ARG_BAD_LENGTH_32: &str = "argument has wrong length: 32 bytes expecte
 pub const ARG_DECODE_ERROR_1: &str = "argument decode error (";
 pub const ARG_DECODE_ERROR_2: &str = "): ";
 pub const STORAGE_VALUE_OUT_OF_RANGE: &str = "storage value out of range";
-pub const STORAGE_DECODE_ERROR: &str = "storage decode error: ";
+pub const STORAGE_DECODE_ERROR_1: &str = "storage decode error (key: ";
+pub const STORAGE_DECODE_ERROR_2: &str = "): ";
 pub const STORAGE_ENCODE_ERROR: &str = "storage encode error: ";
 pub const STORAGE_KEY_ENCODE_ERROR: &str = "storage key encode error: ";
 pub const STORAGE_VALUE_EXCEEDS_BUFFER: &str = "storage value exceeds buffer";

diff --git a/framework/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
@@ -188,10 +188,10 @@ where
 
     fn handle_error(&self, err: DecodeError) -> Self::HandledErr {
         let mut message_buffer =
-            ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR.as_bytes());
-        message_buffer.append_bytes(err.message_bytes());
-        message_buffer.append_bytes(b"at key: ");
+            ManagedBuffer::<M>::new_from_bytes(err_msg::STORAGE_DECODE_ERROR_1.as_bytes());
         M::managed_type_impl().mb_append(message_buffer.get_handle(), self.key.into());
+        message_buffer.append_bytes(err_msg::STORAGE_DECODE_ERROR_2.as_bytes());
+        message_buffer.append_bytes(err.message_bytes());
         M::error_api_impl().signal_error_from_buffer(message_buffer.get_handle())
     }
 }
diff --git a/framework/base/src/storage/storage_get_from_address.rs b/framework/base/src/storage/storage_get_from_address.rs
@@ -1,7 +1,6 @@
 use crate::{
     api::{
-        const_handles, use_raw_handle, ErrorApi, ManagedBufferApiImpl, ManagedTypeApi,
-        StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
+        const_handles, use_raw_handle, ErrorApi, HandleConstraints, ManagedBufferApiImpl, ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl
     },
     codec::*,
     types::{
@@ -148,7 +147,7 @@ where
     T: TopDecode,
     A: StorageReadApi + ManagedTypeApi + ErrorApi,
 {
-    let handle = key.get_raw_handle();
+    let handle = key.get_handle().get_raw_handle_unchecked();
     T::top_decode_or_handle_err(
         StorageGetFromAddressInput::new(addr, key),
         StorageGetErrorHandler::<A>::new(handle),