diff --git a/contracts/utils/pausable/src/errors.rs b/contracts/utils/pausable/src/errors.rs index 9c35a94..b235cb0 100644 --- a/contracts/utils/pausable/src/errors.rs +++ b/contracts/utils/pausable/src/errors.rs @@ -8,4 +8,3 @@ pub enum PausableError { /// The operation failed because the contract is not paused. ExpectedPause = 2, } - diff --git a/contracts/utils/pausable/src/lib.rs b/contracts/utils/pausable/src/lib.rs index fbfbd30..c037268 100644 --- a/contracts/utils/pausable/src/lib.rs +++ b/contracts/utils/pausable/src/lib.rs @@ -7,7 +7,7 @@ mod storage; pub use crate::{ clients::{Pausable, PausableClient}, - storage::{paused, pause, unpause, when_not_paused, when_paused}, + storage::{pause, paused, unpause, when_not_paused, when_paused}, }; mod test; diff --git a/contracts/utils/pausable/src/test.rs b/contracts/utils/pausable/src/test.rs index 5d72070..5417d26 100644 --- a/contracts/utils/pausable/src/test.rs +++ b/contracts/utils/pausable/src/test.rs @@ -13,7 +13,7 @@ use crate::storage::{pause, paused, unpause, when_not_paused, when_paused, PAUSE struct MockContract; #[test] -fn test_initial_state() { +fn initial_state() { let e = Env::default(); let address = e.register(MockContract, ()); @@ -23,7 +23,7 @@ fn test_initial_state() { } #[test] -fn test_pause() { +fn pause_works() { let e = Env::default(); e.mock_all_auths(); let address = e.register(MockContract, ()); @@ -35,18 +35,18 @@ fn test_pause() { assert_eq!(paused(&e), true); //assert_eq!( - //e.auths(), - //[( - //caller.clone(), - //AuthorizedInvocation { - //function: AuthorizedFunction::Contract(( - //address.clone(), - //symbol_short!("pause"), - //vec![&e, caller.clone().into_val(&e)] - //)), - //sub_invocations: [].to_vec() - //} - //)] + //e.auths(), + //[( + //caller.clone(), + //AuthorizedInvocation { + //function: AuthorizedFunction::Contract(( + //address.clone(), + //symbol_short!("pause"), + //vec![&e, caller.clone().into_val(&e)] + //)), + //sub_invocations: [].to_vec() + //} + //)] //); let events = e.events().all(); @@ -66,7 +66,7 @@ fn test_pause() { } #[test] -fn test_unpause() { +fn unpause_works() { let e = Env::default(); e.mock_all_auths(); let address = e.register(MockContract, ()); @@ -97,7 +97,7 @@ fn test_unpause() { #[test] #[should_panic(expected = "Error(Contract, #1)")] -fn test_pause_when_paused() { +fn errors_pause_when_paused() { let e = Env::default(); e.mock_all_auths(); let address = e.register(MockContract, ()); @@ -113,7 +113,7 @@ fn test_pause_when_paused() { #[test] #[should_panic(expected = "Error(Contract, #2)")] -fn test_unpause_when_not_paused() { +fn errors_unpause_when_not_paused() { let e = Env::default(); e.mock_all_auths(); let address = e.register(MockContract, ()); @@ -126,7 +126,7 @@ fn test_unpause_when_not_paused() { } #[test] -fn test_when_not_paused() { +fn when_not_paused_works() { let e = Env::default(); let address = e.register(MockContract, ()); @@ -137,7 +137,7 @@ fn test_when_not_paused() { } #[test] -fn test_when_paused() { +fn when_paused_works() { let e = Env::default(); e.mock_all_auths(); let address = e.register(MockContract, ()); diff --git a/contracts/utils/pausable/test_snapshots/test/test_pause_when_paused.1.json b/contracts/utils/pausable/test_snapshots/test/errors_pause_when_paused.1.json similarity index 100% rename from contracts/utils/pausable/test_snapshots/test/test_pause_when_paused.1.json rename to contracts/utils/pausable/test_snapshots/test/errors_pause_when_paused.1.json diff --git a/contracts/utils/pausable/test_snapshots/test/test_unpause_when_not_paused.1.json b/contracts/utils/pausable/test_snapshots/test/errors_unpause_when_not_paused.1.json similarity index 100% rename from contracts/utils/pausable/test_snapshots/test/test_unpause_when_not_paused.1.json rename to contracts/utils/pausable/test_snapshots/test/errors_unpause_when_not_paused.1.json diff --git a/contracts/utils/pausable/test_snapshots/test/test_initial_state.1.json b/contracts/utils/pausable/test_snapshots/test/initial_state.1.json similarity index 100% rename from contracts/utils/pausable/test_snapshots/test/test_initial_state.1.json rename to contracts/utils/pausable/test_snapshots/test/initial_state.1.json diff --git a/contracts/utils/pausable/test_snapshots/test/test_pause.1.json b/contracts/utils/pausable/test_snapshots/test/pause_works.1.json similarity index 100% rename from contracts/utils/pausable/test_snapshots/test/test_pause.1.json rename to contracts/utils/pausable/test_snapshots/test/pause_works.1.json diff --git a/contracts/utils/pausable/test_snapshots/test/test_unpause.1.json b/contracts/utils/pausable/test_snapshots/test/unpause_works.1.json similarity index 100% rename from contracts/utils/pausable/test_snapshots/test/test_unpause.1.json rename to contracts/utils/pausable/test_snapshots/test/unpause_works.1.json diff --git a/contracts/utils/pausable/test_snapshots/test/test_when_not_paused.1.json b/contracts/utils/pausable/test_snapshots/test/when_not_paused_works.1.json similarity index 100% rename from contracts/utils/pausable/test_snapshots/test/test_when_not_paused.1.json rename to contracts/utils/pausable/test_snapshots/test/when_not_paused_works.1.json diff --git a/contracts/utils/pausable/test_snapshots/test/test_when_paused.1.json b/contracts/utils/pausable/test_snapshots/test/when_paused_works.1.json similarity index 100% rename from contracts/utils/pausable/test_snapshots/test/test_when_paused.1.json rename to contracts/utils/pausable/test_snapshots/test/when_paused_works.1.json diff --git a/examples/pausable/src/contract.rs b/examples/pausable/src/contract.rs index 60fb57b..ea36d1f 100644 --- a/examples/pausable/src/contract.rs +++ b/examples/pausable/src/contract.rs @@ -5,12 +5,11 @@ //! //! Counter can be incremented only when `unpaused` and reset only when `paused`. +use openzeppelin_pausable::{self as pausable, Pausable}; use soroban_sdk::{ contract, contracterror, contractimpl, contracttype, panic_with_error, Address, Env, }; -use openzeppelin_pausable::{self as pausable, Pausable}; - #[contracttype] pub enum DataKey { Owner,