Merge branch 'master' into digital-cash-multi-fee

multiversx · Sep 25, 2023 · fc4aaaf · fc4aaaf
2 parents 02a910c + d80a858
commit fc4aaaf
Show file tree

Hide file tree

Showing 10 changed files with 1,942 additions and 1,512 deletions.
diff --git a/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs
@@ -1,7 +1,7 @@
 use forwarder::nft::{Color, ForwarderNftModule};
 use multiversx_sc::{contract_base::ContractBase, types::Address};
 use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_token_id, rust_biguint,
+    managed_address, managed_biguint, managed_token_id,
     scenario_model::{
         Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, SetStateStep,
     },
@@ -88,7 +88,7 @@ fn test_nft_update_attributes_and_send() {
         &forwarder_whitebox,
         ScCallStep::new()
             .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(NFT_TOKEN_ID, 1, rust_biguint!(1)),
+            .esdt_transfer(NFT_TOKEN_ID, 1, "1"),
         |sc| {
             sc.nft_update_attributes(managed_token_id!(NFT_TOKEN_ID), 1, new_attributes);
 

diff --git a/...s/feature-tests/composability/transfer-role-features/tests/transfer_role_whitebox_test.rs b/...s/feature-tests/composability/transfer-role-features/tests/transfer_role_whitebox_test.rs
@@ -3,7 +3,7 @@ use multiversx_sc::types::{
 };
 use multiversx_sc_modules::transfer_role_proxy::TransferRoleProxyModule;
 use multiversx_sc_scenario::{
-    managed_address, managed_biguint, managed_buffer, managed_token_id, rust_biguint,
+    managed_address, managed_biguint, managed_buffer, managed_token_id,
     scenario_model::{
         Account, AddressValue, CheckAccount, CheckStateStep, ScCallStep, ScDeployStep, SetStateStep,
     },
@@ -95,7 +95,7 @@ fn test_transfer_role() {
         ScCallStep::new().from(USER_ADDRESS_EXPR).esdt_transfer(
             TRANSFER_TOKEN_ID,
             0,
-            rust_biguint!(100),
+            "100",
         ),
         |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
@@ -114,19 +114,19 @@ fn test_transfer_role() {
 
     world.check_state_step(CheckStateStep::new().put_account(
         USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, &rust_biguint!(900)),
+        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "900"),
     ));
     world.check_state_step(CheckStateStep::new().put_account(
         OWNER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, &rust_biguint!(100)),
+        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "100"),
     ));
 
     // transfer to user - err, not whitelisted
     world.whitebox_call_check(
         &transfer_role_features_whitebox,
         ScCallStep::new()
             .from(USER_ADDRESS_EXPR)
-            .esdt_transfer(TRANSFER_TOKEN_ID, 0, rust_biguint!(100))
+            .esdt_transfer(TRANSFER_TOKEN_ID, 0, "100")
             .no_expect(),
         |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
@@ -152,7 +152,7 @@ fn test_transfer_role() {
         ScCallStep::new().from(USER_ADDRESS_EXPR).esdt_transfer(
             TRANSFER_TOKEN_ID,
             0,
-            rust_biguint!(100),
+            "100",
         ),
         |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
@@ -173,11 +173,11 @@ fn test_transfer_role() {
 
     world.check_state_step(CheckStateStep::new().put_account(
         USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, &rust_biguint!(800)),
+        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "800"),
     ));
     world.check_state_step(CheckStateStep::new().put_account(
         VAULT_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, &rust_biguint!(100)),
+        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "100"),
     ));
 
     // transfer to sc - reject
@@ -186,7 +186,7 @@ fn test_transfer_role() {
         ScCallStep::new().from(USER_ADDRESS_EXPR).esdt_transfer(
             TRANSFER_TOKEN_ID,
             0,
-            rust_biguint!(100),
+            "100",
         ),
         |sc| {
             let payments = ManagedVec::from_single_item(EsdtTokenPayment::new(
@@ -207,11 +207,11 @@ fn test_transfer_role() {
 
     world.check_state_step(CheckStateStep::new().put_account(
         USER_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, &rust_biguint!(800)),
+        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "800"),
     ));
     world.check_state_step(CheckStateStep::new().put_account(
         VAULT_ADDRESS_EXPR,
-        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, &rust_biguint!(100)),
+        CheckAccount::new().esdt_balance(TRANSFER_TOKEN_ID_EXPR, "100"),
     ));
 }