diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 07a2b740..34180e2a 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" [dependencies] odra = { path = "../core", default-features = false } odra-modules = { path = "../modules", default-features = false } +sha3 = { version = "0.10.6", default-features = false } [dev-dependencies] hex = "0.4.3" diff --git a/examples/Odra.toml b/examples/Odra.toml index 99006231..df97ca8a 100644 --- a/examples/Odra.toml +++ b/examples/Odra.toml @@ -77,3 +77,11 @@ fqn = "odra_examples::features::modules::ModulesContract" [[contracts]] name = "public_wallet" fqn = "odra_examples::features::native_token::PublicWallet" + +[[contracts]] +name = "mock_moderated" +fqn = "odra_examples::features::access_control::MockModerated" + +[[contracts]] +name = "pauseable_counter" +fqn = "odra_examples::features::pauseable::PauseableCounter" diff --git a/modules/resources/mock_moderated_schema.json b/examples/resources/mock_moderated_schema.json similarity index 100% rename from modules/resources/mock_moderated_schema.json rename to examples/resources/mock_moderated_schema.json diff --git a/modules/resources/pauseable_counter_schema.json b/examples/resources/pauseable_counter_schema.json similarity index 100% rename from modules/resources/pauseable_counter_schema.json rename to examples/resources/pauseable_counter_schema.json diff --git a/modules/src/mock/access_control.rs b/examples/src/features/access_control.rs similarity index 97% rename from modules/src/mock/access_control.rs rename to examples/src/features/access_control.rs index 320649b1..fadd02d7 100644 --- a/modules/src/mock/access_control.rs +++ b/examples/src/features/access_control.rs @@ -1,7 +1,7 @@ use odra::{contract_env, types::Address}; use sha3::{Digest, Keccak256}; -use crate::access::{AccessControl, Role, DEFAULT_ADMIN_ROLE}; +use odra_modules::access::{AccessControl, Role, DEFAULT_ADMIN_ROLE}; pub const ROLE_MODERATOR: &str = "moderator"; pub const ROLE_MODERATOR_ADMIN: &str = "moderator_admin"; @@ -75,13 +75,14 @@ pub fn keccak_256(input: &str) -> Role { #[cfg(test)] pub mod test { - use super::{MockModeratedDeployer, MockModeratedRef, ROLE_MODERATOR, ROLE_MODERATOR_ADMIN}; - use crate::access::{ + use super::{ + keccak_256, MockModeratedDeployer, MockModeratedRef, ROLE_MODERATOR, ROLE_MODERATOR_ADMIN + }; + use odra::{assert_events, test_env, types::Address}; + use odra_modules::access::{ errors::Error, events::{RoleGranted, RoleRevoked} }; - use crate::mock::access_control::keccak_256; - use odra::{assert_events, test_env, types::Address}; #[test] fn deploy_works() { diff --git a/examples/src/features/mod.rs b/examples/src/features/mod.rs index 88f5674d..647c4546 100644 --- a/examples/src/features/mod.rs +++ b/examples/src/features/mod.rs @@ -1,3 +1,4 @@ +pub mod access_control; pub mod collecting_events; pub mod composer; pub mod cross_calls; @@ -8,6 +9,7 @@ pub mod module_nesting; pub mod modules; pub mod native_token; pub mod nested_mapping; +pub mod pauseable; pub mod reentrancy_guard; pub mod signature_verifier; pub mod storage; diff --git a/modules/src/mock/pauseable.rs b/examples/src/features/pauseable.rs similarity index 96% rename from modules/src/mock/pauseable.rs rename to examples/src/features/pauseable.rs index b51cd5fa..41fcc4df 100644 --- a/modules/src/mock/pauseable.rs +++ b/examples/src/features/pauseable.rs @@ -1,6 +1,6 @@ use odra::Variable; -use crate::security::Pauseable; +use odra_modules::security::Pauseable; #[odra::module] pub struct PauseableCounter { @@ -42,11 +42,11 @@ impl PauseableCounter { #[cfg(test)] mod test { use super::PauseableCounterDeployer; - use crate::security::{ + use odra::{assert_events, test_env}; + use odra_modules::security::{ errors::Error, events::{Paused, Unpaused} }; - use odra::{assert_events, test_env}; #[test] fn pause_works() { diff --git a/modules/Cargo.toml b/modules/Cargo.toml index 097338f7..5e37d835 100644 --- a/modules/Cargo.toml +++ b/modules/Cargo.toml @@ -12,7 +12,6 @@ categories = ["wasm"] [dependencies] odra = { path = "../core", version = "0.6.0", default-features = false } hex = { version = "0.4.3", default-features = false } -sha3 = { version = "0.10.6", default-features = false } [features] default = [ "mock-vm" ] diff --git a/modules/Odra.toml b/modules/Odra.toml index d74e9b6e..98799f07 100644 --- a/modules/Odra.toml +++ b/modules/Odra.toml @@ -30,10 +30,3 @@ fqn = "odra_modules::access::Ownable" name = "ownable2_step" fqn = "odra_modules::access::Ownable2Step" -[[contracts]] -name = "mock_moderated" -fqn = "odra_modules::mock::MockModerated" - -[[contracts]] -name = "pauseable_counter" -fqn = "odra_modules::mock::PauseableCounter" diff --git a/modules/src/lib.rs b/modules/src/lib.rs index d7e8f845..7a08a383 100644 --- a/modules/src/lib.rs +++ b/modules/src/lib.rs @@ -8,7 +8,5 @@ pub mod erc20; pub mod erc721; pub mod erc721_receiver; pub mod erc721_token; -#[doc(hidden)] -pub mod mock; pub mod security; pub mod wrapped_native; diff --git a/modules/src/mock/mod.rs b/modules/src/mock/mod.rs deleted file mode 100644 index 8e65eabb..00000000 --- a/modules/src/mock/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -mod access_control; -mod pauseable; - -pub use access_control::{MockModerated, MockModeratedDeployer, MockModeratedRef}; -pub use pauseable::PauseableCounter;