Merge pull request #782 from CosmWasm/multitest-add-staking-module

[multi-test] Add staking and distribution module

Author: chipshort

packages/multi-test/src/app.rs

@@ -17,7 +17,7 @@ use crate::bank::{Bank, BankKeeper, BankSudo};
 use crate::contracts::Contract;
 use crate::executor::{AppResponse, Executor};
 use crate::module::{FailingModule, Module};
-use crate::staking::{Distribution, FailingDistribution, FailingStaking, Staking, StakingSudo};
+use crate::staking::{Distribution, DistributionKeeper, StakeKeeper, Staking, StakingSudo};
 use crate::transactions::transactional;
 use crate::wasm::{ContractData, Wasm, WasmKeeper, WasmSudo};
 
@@ -33,6 +33,8 @@ pub type BasicApp<ExecC = Empty, QueryC = Empty> = App<
     MockStorage,
     FailingModule<ExecC, QueryC, Empty>,
     WasmKeeper<ExecC, QueryC>,
+    StakeKeeper,
+    DistributionKeeper,
 >;
 
 /// Router is a persisted state. You can query this.
@@ -44,8 +46,8 @@ pub struct App<
     Storage = MockStorage,
     Custom = FailingModule<Empty, Empty, Empty>,
     Wasm = WasmKeeper<Empty, Empty>,
-    Staking = FailingStaking,
-    Distr = FailingDistribution,
+    Staking = StakeKeeper,
+    Distr = DistributionKeeper,
 > {
     router: Router<Bank, Custom, Wasm, Staking, Distr>,
     api: Api,
@@ -75,8 +77,8 @@ impl BasicApp {
                 BankKeeper,
                 FailingModule<Empty, Empty, Empty>,
                 WasmKeeper<Empty, Empty>,
-                FailingStaking,
-                FailingDistribution,
+                StakeKeeper,
+                DistributionKeeper,
             >,
             &dyn Api,
             &mut dyn Storage,
@@ -97,8 +99,8 @@ where
             BankKeeper,
             FailingModule<ExecC, QueryC, Empty>,
             WasmKeeper<ExecC, QueryC>,
-            FailingStaking,
-            FailingDistribution,
+            StakeKeeper,
+            DistributionKeeper,
         >,
         &dyn Api,
         &mut dyn Storage,
@@ -159,8 +161,8 @@ pub type BasicAppBuilder<ExecC, QueryC> = AppBuilder<
     MockStorage,
     FailingModule<ExecC, QueryC, Empty>,
     WasmKeeper<ExecC, QueryC>,
-    FailingStaking,
-    FailingDistribution,
+    StakeKeeper,
+    DistributionKeeper,
 >;
 
 /// Utility to build App in stages. If particular items wont be set, defaults would be used
@@ -182,8 +184,8 @@ impl Default
         MockStorage,
         FailingModule<Empty, Empty, Empty>,
         WasmKeeper<Empty, Empty>,
-        FailingStaking,
-        FailingDistribution,
+        StakeKeeper,
+        DistributionKeeper,
     >
 {
     fn default() -> Self {
@@ -198,8 +200,8 @@ impl
         MockStorage,
         FailingModule<Empty, Empty, Empty>,
         WasmKeeper<Empty, Empty>,
-        FailingStaking,
-        FailingDistribution,
+        StakeKeeper,
+        DistributionKeeper,
     >
 {
     /// Creates builder with default components working with empty exec and query messages.
@@ -211,8 +213,8 @@ impl
             bank: BankKeeper::new(),
             wasm: WasmKeeper::new(),
             custom: FailingModule::new(),
-            staking: FailingStaking::new(),
-            distribution: FailingDistribution::new(),
+            staking: StakeKeeper::new(),
+            distribution: DistributionKeeper::new(),
         }
     }
 }
@@ -224,8 +226,8 @@ impl<ExecC, QueryC>
         MockStorage,
         FailingModule<ExecC, QueryC, Empty>,
         WasmKeeper<ExecC, QueryC>,
-        FailingStaking,
-        FailingDistribution,
+        StakeKeeper,
+        DistributionKeeper,
     >
 where
     ExecC: Debug + Clone + PartialEq + JsonSchema + DeserializeOwned + 'static,
@@ -241,8 +243,8 @@ where
             bank: BankKeeper::new(),
             wasm: WasmKeeper::new(),
             custom: FailingModule::new(),
-            staking: FailingStaking::new(),
-            distribution: FailingDistribution::new(),
+            staking: StakeKeeper::new(),
+            distribution: DistributionKeeper::new(),
         }
     }
 }

packages/multi-test/src/contracts.rs

@@ -351,6 +351,7 @@ where
             CosmosMsg::Wasm(wasm) => CosmosMsg::Wasm(wasm),
             CosmosMsg::Bank(bank) => CosmosMsg::Bank(bank),
             CosmosMsg::Staking(staking) => CosmosMsg::Staking(staking),
+            CosmosMsg::Distribution(distribution) => CosmosMsg::Distribution(distribution),
             CosmosMsg::Custom(_) => unreachable!(),
             #[cfg(feature = "stargate")]
             CosmosMsg::Ibc(ibc) => CosmosMsg::Ibc(ibc),

packages/multi-test/src/lib.rs

@@ -28,5 +28,5 @@ pub use crate::bank::{Bank, BankKeeper, BankSudo};
 pub use crate::contracts::{Contract, ContractWrapper};
 pub use crate::executor::{AppResponse, Executor};
 pub use crate::module::{FailingModule, Module};
-pub use crate::staking::{FailingDistribution, FailingStaking, Staking, StakingSudo};
+pub use crate::staking::{DistributionKeeper, StakeKeeper, Staking, StakingInfo, StakingSudo};
 pub use crate::wasm::{Wasm, WasmKeeper, WasmSudo};