create expect error

contracts/feature-tests/panic-message-features/tests/pmf_blackbox_test.rs

@@ -73,8 +73,7 @@ fn tx_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .with_result(ExpectStatus(4))
-        .with_result(ExpectMessage("sc_panic! test"))
+        .with_result(ExpectError("sc_panic! test", 4))
         .run();
 }
 
@@ -87,7 +86,6 @@ fn query_expect_error_test() {
         .to(SC_PMF)
         .typed(pmf_proxy::PanicMessageFeaturesProxy)
         .sc_panic()
-        .with_result(ExpectStatus(4))
-        .with_result(ExpectMessage("sc_panic! test"))
+        .with_result(ExpectError("sc_panic! test", 4))
         .run();
 }

framework/scenario/src/facade/result_handlers.rs

@@ -1,13 +1,11 @@
-mod expect_message;
-mod expect_status;
+mod expect_error;
 mod returns_message;
 mod returns_new_bech32_address;
 mod returns_new_token_identifier;
 mod returns_status;
 mod with_tx_raw_response;
 
-pub use expect_message::ExpectMessage;
-pub use expect_status::ExpectStatus;
+pub use expect_error::ExpectError;
 pub use returns_message::ReturnsMessage;
 pub use returns_new_bech32_address::ReturnsNewBech32Address;
 pub use returns_new_token_identifier::ReturnsNewTokenIdentifier;

framework/scenario/src/facade/result_handlers/expect_message.rs → framework/scenario/src/facade/result_handlers/expect_error.rs

@@ -3,19 +3,19 @@ use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
 
 use crate::scenario_model::{BytesValue, CheckValue, TxExpect, TxResponse};
 
-/// Verifies that transaction result message matches the given one.
+/// Verifies that transaction result error matches the given one.
 ///
 /// Can only be used in tests and interactors, not available in contracts.
-pub struct ExpectMessage<'a>(pub &'a str);
+pub struct ExpectError<'a>(pub &'a str, pub u64);
 
-impl<'a, Env, Original> RHListItem<Env, Original> for ExpectMessage<'a>
+impl<'a, Env, Original> RHListItem<Env, Original> for ExpectError<'a>
 where
     Env: TxEnv,
 {
     type Returns = ();
 }
 
-impl<'a, Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectMessage<'a>
+impl<'a, Env, Original> RHListItemExec<TxResponse, Env, Original> for ExpectError<'a>
 where
     Env: TxEnv<RHExpect = TxExpect>,
 {
@@ -25,6 +25,7 @@ where
             original: ValueSubTree::Str(format!("str:{}", self.0)),
         };
         prev.message = CheckValue::Equal(expect_message_expr);
+        prev.status = CheckValue::Equal(self.1.into());
         prev
     }