Merge pull request #1645 from multiversx/rename-fwd-files

renamed files in forwarder & forwarder-legacy
multiversx · May 23, 2024 · 08ac2fa · 08ac2fa
2 parents a4eab37 + 23f4129
commit 08ac2fa
Show file tree

Hide file tree

Showing 34 changed files with 73 additions and 73 deletions.
diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs b/contracts/feature-tests/composability/forwarder-legacy/src/forwarder_legacy_main.rs
@@ -2,34 +2,34 @@
 #![allow(clippy::type_complexity)]
 #![allow(clippy::let_unit_value)]
 
-pub mod call_async_legacy;
-pub mod call_sync_legacy;
-pub mod call_transf_exec_legacy;
-pub mod contract_change_owner_legacy;
-pub mod contract_deploy_legacy;
-pub mod contract_upgrade_legacy;
-pub mod esdt_legacy;
-pub mod nft_legacy;
-pub mod roles_legacy;
-pub mod sft_legacy;
-pub mod storage_legacy;
+pub mod fwd_call_async_legacy;
+pub mod fwd_call_sync_legacy;
+pub mod fwd_call_transf_exec_legacy;
+pub mod fwd_change_owner_legacy;
+pub mod fwd_deploy_legacy;
+pub mod fwd_esdt_legacy;
+pub mod fwd_nft_legacy;
+pub mod fwd_roles_legacy;
+pub mod fwd_sft_legacy;
+pub mod fwd_storage_legacy;
+pub mod fwd_upgrade_legacy;
 
 multiversx_sc::imports!();
 
 /// Test contract for investigating backwards compatibility in smart contract calls.
 #[multiversx_sc::contract]
 pub trait ForwarderLegacy:
-    call_sync_legacy::ForwarderSyncCallModule
-    + call_async_legacy::ForwarderAsyncCallModule
-    + call_transf_exec_legacy::ForwarderTransferExecuteModule
-    + contract_change_owner_legacy::ChangeOwnerModule
-    + contract_deploy_legacy::DeployContractModule
-    + contract_upgrade_legacy::UpgradeContractModule
-    + esdt_legacy::ForwarderEsdtModule
-    + sft_legacy::ForwarderSftModule
-    + nft_legacy::ForwarderNftModule
-    + roles_legacy::ForwarderRolesModule
-    + storage_legacy::ForwarderStorageModule
+    fwd_call_sync_legacy::ForwarderSyncCallModule
+    + fwd_call_async_legacy::ForwarderAsyncCallModule
+    + fwd_call_transf_exec_legacy::ForwarderTransferExecuteModule
+    + fwd_change_owner_legacy::ChangeOwnerModule
+    + fwd_deploy_legacy::DeployContractModule
+    + fwd_upgrade_legacy::UpgradeContractModule
+    + fwd_esdt_legacy::ForwarderEsdtModule
+    + fwd_sft_legacy::ForwarderSftModule
+    + fwd_nft_legacy::ForwarderNftModule
+    + fwd_roles_legacy::ForwarderRolesModule
+    + fwd_storage_legacy::ForwarderStorageModule
 {
     #[init]
     fn init(&self) {}

diff --git a/...forwarder-legacy/src/call_async_legacy.rs → ...arder-legacy/src/fwd_call_async_legacy.rs b/...forwarder-legacy/src/call_async_legacy.rs → ...arder-legacy/src/fwd_call_async_legacy.rs
diff --git a/.../forwarder-legacy/src/call_sync_legacy.rs → ...warder-legacy/src/fwd_call_sync_legacy.rs b/.../forwarder-legacy/src/call_sync_legacy.rs → ...warder-legacy/src/fwd_call_sync_legacy.rs
diff --git a/...der-legacy/src/call_transf_exec_legacy.rs → ...legacy/src/fwd_call_transf_exec_legacy.rs b/...der-legacy/src/call_transf_exec_legacy.rs → ...legacy/src/fwd_call_transf_exec_legacy.rs
diff --git a/...egacy/src/contract_change_owner_legacy.rs → ...der-legacy/src/fwd_change_owner_legacy.rs b/...egacy/src/contract_change_owner_legacy.rs → ...der-legacy/src/fwd_change_owner_legacy.rs
diff --git a/...rder-legacy/src/contract_deploy_legacy.rs → ...forwarder-legacy/src/fwd_deploy_legacy.rs b/...rder-legacy/src/contract_deploy_legacy.rs → ...forwarder-legacy/src/fwd_deploy_legacy.rs
diff --git a/...ility/forwarder-legacy/src/esdt_legacy.rs → ...y/forwarder-legacy/src/fwd_esdt_legacy.rs b/...ility/forwarder-legacy/src/esdt_legacy.rs → ...y/forwarder-legacy/src/fwd_esdt_legacy.rs
@@ -1,6 +1,6 @@
 multiversx_sc::imports!();
 
-use super::storage_legacy;
+use super::fwd_storage_legacy;
 
 const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
 
@@ -17,7 +17,7 @@ pub type EsdtTokenDataMultiValue<M> = MultiValue9<
 >;
 
 #[multiversx_sc::module]
-pub trait ForwarderEsdtModule: storage_legacy::ForwarderStorageModule {
+pub trait ForwarderEsdtModule: fwd_storage_legacy::ForwarderStorageModule {
     #[view(getFungibleEsdtBalance)]
     fn get_fungible_esdt_balance(&self, token_identifier: &TokenIdentifier) -> BigUint {
         self.blockchain()

diff --git a/...bility/forwarder-legacy/src/nft_legacy.rs → ...ty/forwarder-legacy/src/fwd_nft_legacy.rs b/...bility/forwarder-legacy/src/nft_legacy.rs → ...ty/forwarder-legacy/src/fwd_nft_legacy.rs
@@ -1,7 +1,7 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-use super::storage_legacy;
+use super::fwd_storage_legacy;
 
 // used as mock attributes for NFTs
 #[derive(TopEncode, TopDecode, TypeAbi, Clone, Copy, PartialEq, Debug)]
@@ -21,7 +21,7 @@ pub struct ComplexAttributes<M: ManagedTypeApi> {
 }
 
 #[multiversx_sc::module]
-pub trait ForwarderNftModule: storage_legacy::ForwarderStorageModule {
+pub trait ForwarderNftModule: fwd_storage_legacy::ForwarderStorageModule {
     #[view]
     fn get_nft_balance(&self, token_identifier: &TokenIdentifier, nonce: u64) -> BigUint {
         self.blockchain().get_esdt_balance(

diff --git a/...lity/forwarder-legacy/src/roles_legacy.rs → .../forwarder-legacy/src/fwd_roles_legacy.rs b/...lity/forwarder-legacy/src/roles_legacy.rs → .../forwarder-legacy/src/fwd_roles_legacy.rs
@@ -1,9 +1,9 @@
 multiversx_sc::imports!();
 
-use super::storage_legacy;
+use super::fwd_storage_legacy;
 
 #[multiversx_sc::module]
-pub trait ForwarderRolesModule: storage_legacy::ForwarderStorageModule {
+pub trait ForwarderRolesModule: fwd_storage_legacy::ForwarderStorageModule {
     #[endpoint(setLocalRoles)]
     fn set_local_roles(
         &self,

diff --git a/...bility/forwarder-legacy/src/sft_legacy.rs → ...ty/forwarder-legacy/src/fwd_sft_legacy.rs b/...bility/forwarder-legacy/src/sft_legacy.rs → ...ty/forwarder-legacy/src/fwd_sft_legacy.rs
@@ -1,9 +1,9 @@
 multiversx_sc::imports!();
 
-use super::storage_legacy;
+use super::fwd_storage_legacy;
 
 #[multiversx_sc::module]
-pub trait ForwarderSftModule: storage_legacy::ForwarderStorageModule {
+pub trait ForwarderSftModule: fwd_storage_legacy::ForwarderStorageModule {
     #[payable("EGLD")]
     #[endpoint]
     fn sft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {

diff --git a/...ty/forwarder-legacy/src/storage_legacy.rs → ...orwarder-legacy/src/fwd_storage_legacy.rs b/...ty/forwarder-legacy/src/storage_legacy.rs → ...orwarder-legacy/src/fwd_storage_legacy.rs
diff --git a/...der-legacy/src/contract_upgrade_legacy.rs → ...orwarder-legacy/src/fwd_upgrade_legacy.rs b/...der-legacy/src/contract_upgrade_legacy.rs → ...orwarder-legacy/src/fwd_upgrade_legacy.rs
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -1,36 +1,36 @@
 #![no_std]
 #![allow(clippy::type_complexity)]
 
-pub mod call_async;
-pub mod call_sync;
-pub mod call_transf_exec;
-pub mod contract_change_owner;
-pub mod contract_deploy;
-pub mod contract_upgrade;
-pub mod esdt;
 pub mod forwarder_proxy;
-pub mod nft;
-pub mod roles;
-pub mod sft;
-pub mod storage;
+pub mod fwd_call_async;
+pub mod fwd_call_sync;
+pub mod fwd_call_transf_exec;
+pub mod fwd_change_owner;
+pub mod fwd_deploy;
+pub mod fwd_esdt;
+pub mod fwd_nft;
+pub mod fwd_roles;
+pub mod fwd_sft;
+pub mod fwd_storage;
+pub mod fwd_upgrade;
 pub mod vault_proxy;
 
 multiversx_sc::imports!();
 
 /// Test contract for investigating contract calls.
 #[multiversx_sc::contract]
 pub trait Forwarder:
-    call_sync::ForwarderSyncCallModule
-    + call_async::ForwarderAsyncCallModule
-    + call_transf_exec::ForwarderTransferExecuteModule
-    + contract_change_owner::ChangeOwnerModule
-    + contract_deploy::DeployContractModule
-    + contract_upgrade::UpgradeContractModule
-    + esdt::ForwarderEsdtModule
-    + sft::ForwarderSftModule
-    + nft::ForwarderNftModule
-    + roles::ForwarderRolesModule
-    + storage::ForwarderStorageModule
+    fwd_call_sync::ForwarderSyncCallModule
+    + fwd_call_async::ForwarderAsyncCallModule
+    + fwd_call_transf_exec::ForwarderTransferExecuteModule
+    + fwd_change_owner::ChangeOwnerModule
+    + fwd_deploy::DeployContractModule
+    + fwd_upgrade::UpgradeContractModule
+    + fwd_esdt::ForwarderEsdtModule
+    + fwd_sft::ForwarderSftModule
+    + fwd_nft::ForwarderNftModule
+    + fwd_roles::ForwarderRolesModule
+    + fwd_storage::ForwarderStorageModule
 {
     #[init]
     fn init(&self) {}

diff --git a/...composability/forwarder/src/call_async.rs → ...osability/forwarder/src/fwd_call_async.rs b/...composability/forwarder/src/call_async.rs → ...osability/forwarder/src/fwd_call_async.rs
diff --git a/.../composability/forwarder/src/call_sync.rs → ...posability/forwarder/src/fwd_call_sync.rs b/.../composability/forwarder/src/call_sync.rs → ...posability/forwarder/src/fwd_call_sync.rs
diff --git a/...ability/forwarder/src/call_transf_exec.rs → ...ity/forwarder/src/fwd_call_transf_exec.rs b/...ability/forwarder/src/call_transf_exec.rs → ...ity/forwarder/src/fwd_call_transf_exec.rs
diff --git a/...ty/forwarder/src/contract_change_owner.rs → ...ability/forwarder/src/fwd_change_owner.rs b/...ty/forwarder/src/contract_change_owner.rs → ...ability/forwarder/src/fwd_change_owner.rs
diff --git a/...sability/forwarder/src/contract_deploy.rs → ...composability/forwarder/src/fwd_deploy.rs b/...sability/forwarder/src/contract_deploy.rs → ...composability/forwarder/src/fwd_deploy.rs
diff --git a/...tests/composability/forwarder/src/esdt.rs → ...s/composability/forwarder/src/fwd_esdt.rs b/...tests/composability/forwarder/src/esdt.rs → ...s/composability/forwarder/src/fwd_esdt.rs
@@ -1,6 +1,6 @@
 multiversx_sc::imports!();
 
-use super::storage;
+use super::fwd_storage;
 
 const PERCENTAGE_TOTAL: u64 = 10_000; // 100%
 
@@ -17,7 +17,7 @@ pub type EsdtTokenDataMultiValue<M> = MultiValue9<
 >;
 
 #[multiversx_sc::module]
-pub trait ForwarderEsdtModule: storage::ForwarderStorageModule {
+pub trait ForwarderEsdtModule: fwd_storage::ForwarderStorageModule {
     #[view(getFungibleEsdtBalance)]
     fn get_fungible_esdt_balance(&self, token_identifier: &TokenIdentifier) -> BigUint {
         self.blockchain()

diff --git a/...-tests/composability/forwarder/src/nft.rs → ...ts/composability/forwarder/src/fwd_nft.rs b/...-tests/composability/forwarder/src/nft.rs → ...ts/composability/forwarder/src/fwd_nft.rs
@@ -1,7 +1,7 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-use super::storage;
+use super::fwd_storage;
 
 // used as mock attributes for NFTs
 #[type_abi]
@@ -23,7 +23,7 @@ pub struct ComplexAttributes<M: ManagedTypeApi> {
 }
 
 #[multiversx_sc::module]
-pub trait ForwarderNftModule: storage::ForwarderStorageModule {
+pub trait ForwarderNftModule: fwd_storage::ForwarderStorageModule {
     #[view]
     fn get_nft_balance(&self, token_identifier: &TokenIdentifier, nonce: u64) -> BigUint {
         self.blockchain().get_esdt_balance(

diff --git a/...ests/composability/forwarder/src/roles.rs → .../composability/forwarder/src/fwd_roles.rs b/...ests/composability/forwarder/src/roles.rs → .../composability/forwarder/src/fwd_roles.rs
@@ -1,9 +1,9 @@
 multiversx_sc::imports!();
 
-use super::storage;
+use super::fwd_storage;
 
 #[multiversx_sc::module]
-pub trait ForwarderRolesModule: storage::ForwarderStorageModule {
+pub trait ForwarderRolesModule: fwd_storage::ForwarderStorageModule {
     #[endpoint(setLocalRoles)]
     fn set_local_roles(
         &self,

diff --git a/...-tests/composability/forwarder/src/sft.rs → ...ts/composability/forwarder/src/fwd_sft.rs b/...-tests/composability/forwarder/src/sft.rs → ...ts/composability/forwarder/src/fwd_sft.rs
@@ -1,9 +1,9 @@
 multiversx_sc::imports!();
 
-use super::storage;
+use super::fwd_storage;
 
 #[multiversx_sc::module]
-pub trait ForwarderSftModule: storage::ForwarderStorageModule {
+pub trait ForwarderSftModule: fwd_storage::ForwarderStorageModule {
     #[payable("EGLD")]
     #[endpoint]
     fn sft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {

diff --git a/...ts/composability/forwarder/src/storage.rs → ...omposability/forwarder/src/fwd_storage.rs b/...ts/composability/forwarder/src/storage.rs → ...omposability/forwarder/src/fwd_storage.rs
diff --git a/...ability/forwarder/src/contract_upgrade.rs → ...omposability/forwarder/src/fwd_upgrade.rs b/...ability/forwarder/src/contract_upgrade.rs → ...omposability/forwarder/src/fwd_upgrade.rs
diff --git a/...mises-features/src/call_promise_direct.rs → ...s-features/src/fwd_call_promise_direct.rs b/...mises-features/src/call_promise_direct.rs → ...s-features/src/fwd_call_promise_direct.rs
diff --git a/...ty/promises-features/src/call_promises.rs → ...romises-features/src/fwd_call_promises.rs b/...ty/promises-features/src/call_promises.rs → ...romises-features/src/fwd_call_promises.rs
diff --git a/...promises-features/src/call_promises_bt.rs → ...ises-features/src/fwd_call_promises_bt.rs b/...promises-features/src/call_promises_bt.rs → ...ises-features/src/fwd_call_promises_bt.rs
diff --git a/...ity/promises-features/src/call_sync_bt.rs → ...promises-features/src/fwd_call_sync_bt.rs b/...ity/promises-features/src/call_sync_bt.rs → ...promises-features/src/fwd_call_sync_bt.rs
diff --git a/contracts/feature-tests/composability/promises-features/src/promises_main.rs b/contracts/feature-tests/composability/promises-features/src/promises_main.rs
@@ -1,11 +1,11 @@
 #![no_std]
 #![allow(clippy::type_complexity)]
 
-mod call_promise_direct;
-mod call_promises;
-mod call_promises_bt;
-pub mod call_sync_bt;
 mod common;
+mod fwd_call_promise_direct;
+mod fwd_call_promises;
+mod fwd_call_promises_bt;
+pub mod fwd_call_sync_bt;
 pub mod vault_proxy;
 
 multiversx_sc::imports!();
@@ -14,10 +14,10 @@ multiversx_sc::imports!();
 #[multiversx_sc::contract]
 pub trait PromisesFeatures:
     common::CommonModule
-    + call_promises::CallPromisesModule
-    + call_promise_direct::CallPromisesDirectModule
-    + call_sync_bt::BackTransfersFeatureModule
-    + call_promises_bt::CallPromisesBackTransfersModule
+    + fwd_call_promises::CallPromisesModule
+    + fwd_call_promise_direct::CallPromisesDirectModule
+    + fwd_call_sync_bt::BackTransfersFeatureModule
+    + fwd_call_promises_bt::CallPromisesBackTransfersModule
 {
     #[init]
     fn init(&self) {}

diff --git a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
@@ -1,6 +1,6 @@
 #![allow(deprecated)]
 
-use forwarder_legacy::nft_legacy::{Color, ProxyTrait as _};
+use forwarder_legacy::fwd_nft_legacy::{Color, ProxyTrait as _};
 
 use multiversx_sc_scenario::{
     api::StaticApi,

diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_legacy_test.rs
@@ -1,4 +1,4 @@
-use forwarder_legacy::nft_legacy::{Color, ForwarderNftModule};
+use forwarder_legacy::fwd_nft_legacy::{Color, ForwarderNftModule};
 use multiversx_sc::{contract_base::ContractBase, types::Address};
 use multiversx_sc_scenario::{
     managed_address, managed_biguint, managed_token_id,

diff --git a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
@@ -1,4 +1,4 @@
-use forwarder::nft::{Color, ForwarderNftModule};
+use forwarder::fwd_nft::{Color, ForwarderNftModule};
 use multiversx_sc_scenario::imports::*;
 
 const USER_ADDRESS_EXPR: &str = "address:user";

diff --git a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
@@ -3,7 +3,7 @@
 use multiversx_sc::types::BigUint;
 use multiversx_sc_scenario::imports::*;
 
-use promises_features::call_sync_bt::ProxyTrait;
+use promises_features::fwd_call_sync_bt::ProxyTrait;
 
 const USER_ADDRESS_EXPR: &str = "address:user";
 const PROMISES_FEATURE_ADDRESS_EXPR: &str = "sc:promises-feature";

diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_whitebox_legacy_test.rs
@@ -3,7 +3,7 @@ use num_traits::ToPrimitive;
 
 use adder::*;
 use basic_features::BasicFeatures;
-use forwarder::call_sync::*;
+use forwarder::fwd_call_sync::*;
 use rust_testing_framework_tester::{dummy_module::DummyModule, *};
 
 const TEST_OUTPUT_PATH: &str = "test.scen.json";