Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor sc-storage #219

Merged
merged 24 commits into from
Nov 4, 2024
Merged

refactor sc-storage #219

merged 24 commits into from
Nov 4, 2024

Conversation

evelinemolnar
Copy link
Contributor

No description provided.

evelinemolnar and others added 10 commits October 7, 2024 13:48
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	bridge-proxy/src/bridge-proxy.rs
#	bridged-tokens-wrapper/Cargo.toml
#	bridged-tokens-wrapper/src/lib.rs
#	common/fee-estimator-module/Cargo.toml
#	common/sc-proxies/src/esdt_safe_proxy.rs
#	esdt-safe/Cargo.toml
#	esdt-safe/src/lib.rs
#	esdt-safe/tests/esdt_safe_blackbox_test.rs
#	esdt-safe/wasm/Cargo.lock
#	esdt-safe/wasm/src/lib.rs
#	multisig/sc-config.toml
Copy link

github-actions bot commented Oct 25, 2024

Coverage Summary

Totals

Count Covered %
Lines 10065 7412 73.64
Regions 1646 1082 65.74
Functions 829 531 64.05
Instantiations 5065 1508 29.77

Files

Expand
File Lines Regions Functions Instantiations
/home/runner/.cargo/git/checkouts/mx-contracts-rs-13011bd47afef959/e72c201/contracts/crowdfunding-esdt/src/crowdfunding_esdt.rs 51.56% 57.14% 77.78% 64.00%
/home/runner/.cargo/git/checkouts/mx-contracts-rs-13011bd47afef959/e72c201/contracts/crowdfunding-esdt/src/crowdfunding_esdt_proxy.rs 100.00% 100.00% 100.00% 100.00%
/bridge-proxy/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/bridge-proxy/src/bridge-proxy.rs 45.70% 60.00% 57.14% 21.51%
/bridge-proxy/src/config.rs 100.00% 66.67% 100.00% 30.00%
/bridge-proxy/tests/bridge_proxy_blackbox_test.rs 82.22% 87.50% 76.92% 76.92%
/bridged-tokens-wrapper/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/bridged-tokens-wrapper/src/dfp_big_uint.rs 100.00% 100.00% 100.00% 50.00%
/bridged-tokens-wrapper/src/events.rs 100.00% 33.33% 100.00% 10.34%
/bridged-tokens-wrapper/src/lib.rs 100.00% 100.00% 100.00% 23.19%
/bridged-tokens-wrapper/tests/bridged_tokens_wrapper_whitebox_test.rs 90.12% 90.80% 90.22% 90.22%
/bridged-tokens-wrapper/tests/dfp_big_uint_test.rs 100.00% 100.00% 100.00% 100.00%
/bridged-tokens-wrapper/tests/scenario_go_test.rs 100.00% 100.00% 100.00% 100.00%
/common/eth-address/src/lib.rs 93.33% 66.67% 88.89% 48.45%
/common/fee-estimator-module/src/lib.rs 100.00% 93.33% 100.00% 24.77%
/common/fee-estimator-module/src/price_aggregator_proxy.rs 6.14% 4.76% 6.67% 10.53%
/common/max-bridged-amount-module/src/lib.rs 100.00% 87.50% 100.00% 24.27%
/common/mock-contracts/mock-bridge-proxy/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-bridge-proxy/src/mock_bridge_proxy.rs 100.00% 33.33% 100.00% 3.70%
/common/mock-contracts/mock-bridged-tokens-wrapper/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-bridged-tokens-wrapper/src/mock_bridged_tokens_wrapper.rs 100.00% 33.33% 100.00% 3.23%
/common/mock-contracts/mock-esdt-safe/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-esdt-safe/src/mock_esdt_safe.rs 100.00% 33.33% 100.00% 3.70%
/common/mock-contracts/mock-multi-transfer-esdt/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-multi-transfer-esdt/src/mock_multi_transfer_esdt.rs 100.00% 33.33% 100.00% 6.06%
/common/mock-contracts/mock-multisig/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-multisig/src/mock_multisig.rs 100.00% 100.00% 100.00% 35.48%
/common/mock-contracts/mock-price-aggregator/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/common/mock-contracts/mock-price-aggregator/src/mock_price_aggregator.rs 100.00% 66.67% 100.00% 20.00%
/common/mock-proxies/src/mock_multisig_proxy.rs 72.41% 62.50% 62.50% 55.56%
/common/sc-proxies/src/bridge_proxy_contract_proxy.rs 67.01% 63.64% 63.64% 50.00%
/common/sc-proxies/src/bridged_tokens_wrapper_proxy.rs 43.19% 45.00% 45.00% 38.18%
/common/sc-proxies/src/crowdfunding_esdt_proxy.rs 0.00% 0.00% 0.00% 0.00%
/common/sc-proxies/src/esdt_safe_proxy.rs 68.97% 52.38% 59.26% 35.84%
/common/sc-proxies/src/multi_transfer_esdt_proxy.rs 35.40% 37.50% 37.50% 33.33%
/common/sc-proxies/src/multisig_proxy.rs 16.24% 12.50% 14.46% 15.84%
/common/storage-module/src/lib.rs 100.00% 88.89% 100.00% 26.17%
/common/token-module/src/lib.rs 91.38% 81.01% 90.00% 29.57%
/common/transaction/src/lib.rs 73.58% 50.98% 66.67% 39.30%
/common/transaction/src/transaction_status.rs 83.33% 66.67% 83.33% 41.67%
/common/tx-batch-module/src/batch_status.rs 66.67% 50.00% 66.67% 20.00%
/common/tx-batch-module/src/lib.rs 88.64% 82.19% 87.50% 24.26%
/common/tx-batch-module/src/tx_batch_mapper.rs 97.01% 93.10% 100.00% 52.50%
/esdt-safe/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/esdt-safe/src/lib.rs 89.07% 71.90% 78.38% 27.96%
/esdt-safe/tests/esdt_safe_blackbox_test.rs 99.21% 83.33% 100.00% 100.00%
/esdt-safe/tests/esdt_safe_scenario_rs_test.rs 100.00% 100.00% 100.00% 100.00%
/esdt-safe/tests/scenario_go_test.rs 100.00% 100.00% 100.00% 100.00%
/multi-transfer-esdt/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/multi-transfer-esdt/src/lib.rs 82.89% 80.00% 76.92% 23.57%
/multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs 85.73% 74.36% 77.42% 77.42%
/multi-transfer-esdt/tests/multi_transfer_esdt_scenario_rs_test.rs 57.14% 30.00% 30.00% 30.00%
/multi-transfer-esdt/tests/scenario_go_test.rs 30.00% 30.00% 30.00% 30.00%
/multisig/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/multisig/src/action.rs 25.00% 22.22% 33.33% 30.77%
/multisig/src/events.rs 100.00% 66.67% 100.00% 12.90%
/multisig/src/lib.rs 67.93% 70.00% 70.00% 25.66%
/multisig/src/multisig_general.rs 80.00% 65.38% 75.00% 30.77%
/multisig/src/queries.rs 64.52% 61.76% 57.89% 15.79%
/multisig/src/setup.rs 26.11% 33.33% 25.93% 7.11%
/multisig/src/storage.rs 100.00% 66.67% 100.00% 27.15%
/multisig/src/user_role.rs 83.33% 72.73% 75.00% 41.67%
/multisig/src/util.rs 94.44% 84.38% 100.00% 44.12%
/multisig/tests/multisig_blackbox_test.rs 100.00% 100.00% 100.00% 100.00%
/multisig/tests/multisig_scenario_rs_test.rs 82.69% 72.73% 72.73% 72.73%
/multisig/tests/scenario_go_test.rs 70.00% 70.00% 70.00% 70.00%
/test-caller/meta/src/main.rs 0.00% 0.00% 0.00% 0.00%
/test-caller/src/test-caller.rs 0.00% 0.00% 0.00% 0.00%

Copy link

github-actions bot commented Oct 25, 2024

Contract comparison - from 697dde1 to c9eb08a

Path                                                                                             size                  has-allocator                     has-format
test-caller.wasm 3274 false without message
test-caller-dbg.wasm 7110 false without message
esdt-safe.wasm 27476 ➡️ 26288 🟢 false without message
esdt-safe-dbg.wasm 65293 ➡️ 62484 🟢 false without message
mock-multi-transfer-esdt.wasm 241 false none
mock-multi-transfer-esdt-dbg.wasm 664 false none
mock-multisig-dbg.wasm 2752 ➡️ 5676 🔴 false none
mock-multisig.wasm 1067 ➡️ 2186 🔴 false none
mock-esdt-safe.wasm 688 false none
mock-esdt-safe-dbg.wasm 1800 false none
mock-price-aggregator-dbg.wasm 2765 ➡️ 2946 🔴 false none
mock-price-aggregator.wasm 1034 ➡️ 1099 🔴 false none
mock-bridge-proxy.wasm 728 false none
mock-bridge-proxy-dbg.wasm 1938 false none
mock-bridged-tokens-wrapper-dbg.wasm 2530 false none
mock-bridged-tokens-wrapper.wasm 942 false none
multi-transfer-esdt.wasm 17273 ➡️ 16519 🟢 false without message
multi-transfer-esdt-dbg.wasm 40924 ➡️ 39360 🟢 false without message
bridge-proxy-dbg.wasm 37325 ➡️ 35155 🟢 false without message
bridge-proxy.wasm 14238 ➡️ 13363 🟢 false without message
bridged-tokens-wrapper.wasm 9152 ➡️ 8836 🟢 false without message
bridged-tokens-wrapper-dbg.wasm 26745 ➡️ 25902 🟢 false without message
multisig-dbg.wasm 72047 ➡️ 71081 🟢 false without message
multisig.wasm 29366 ➡️ 28936 🟢 false without message

@evelinemolnar evelinemolnar marked this pull request as ready for review October 25, 2024 11:42
&self,
owner_address: ManagedAddress,
) -> SingleValueMapper<ManagedAddress, ManagedAddress> {
SingleValueMapper::<_, _, ManagedAddress>::new_from_address(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

get the owner_address there so you dont have to have duplicated code

#[storage_mapper("esdtSafeContractAddress")]
fn esdt_safe_contract_address(&self) -> SingleValueMapper<ManagedAddress>;
#[storage_mapper("ownerAddress")]
fn owner_address_storage(&self) -> SingleValueMapper<ManagedAddress<Self::Api>>;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this

CostinCarabas
CostinCarabas previously approved these changes Oct 30, 2024
# Conflicts:
#	bridged-tokens-wrapper/src/lib.rs
#	esdt-safe/src/lib.rs
#	multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs
CostinCarabas
CostinCarabas previously approved these changes Oct 30, 2024
@@ -4,5 +4,6 @@ pub mod bridge_proxy_contract_proxy;
pub mod bridged_tokens_wrapper_proxy;
pub mod crowdfunding_esdt_proxy;
pub mod esdt_safe_proxy;
pub mod mock_multisig_proxy;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to include mock into productive code ?

@dragos-rebegea dragos-rebegea merged commit 34639d5 into feat/v3.5 Nov 4, 2024
5 checks passed
@dragos-rebegea dragos-rebegea deleted the refactor-scstorage branch November 4, 2024 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants