Browse Source

substrate upgrade: use ReservableCurrency trait

Mokhtar Naamani 6 years ago
parent
commit
9ecf2f470b
4 changed files with 8 additions and 4 deletions
  1. 1 1
      src/governance/election.rs
  2. 2 1
      src/governance/mod.rs
  3. 1 1
      src/governance/proposals.rs
  4. 4 1
      src/lib.rs

+ 1 - 1
src/governance/election.rs

@@ -1,5 +1,5 @@
 use rstd::prelude::*;
-use srml_support::traits::Currency;
+use srml_support::traits::{Currency, ReservableCurrency};
 use srml_support::{
     decl_event, decl_module, decl_storage, dispatch::Result, ensure, StorageMap, StorageValue,
 };

+ 2 - 1
src/governance/mod.rs

@@ -1,4 +1,4 @@
-use srml_support::traits::{Currency, LockableCurrency};
+use srml_support::traits::{Currency, LockableCurrency, ReservableCurrency};
 use system;
 
 pub mod council;
@@ -10,6 +10,7 @@ mod stake;
 
 pub trait GovernanceCurrency: system::Trait + Sized {
     type Currency: Currency<Self::AccountId>
+        + ReservableCurrency<Self::AccountId>
         + LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
 }
 

+ 1 - 1
src/governance/proposals.rs

@@ -1,7 +1,7 @@
 use rstd::prelude::*;
 use runtime_io::print;
 use runtime_primitives::traits::{As, Hash, Zero};
-use srml_support::traits::Currency;
+use srml_support::traits::{Currency, ReservableCurrency};
 use srml_support::{
     decl_event, decl_module, decl_storage, dispatch, ensure, StorageMap, StorageValue,
 };

+ 4 - 1
src/lib.rs

@@ -38,7 +38,10 @@ use roles::actors;
 use rstd::prelude::*; // needed for Vec
 use runtime_primitives::{
     create_runtime_str, generic,
-    traits::{self as runtime_traits, BlakeTwo256, Block as BlockT, StaticLookup, Verify, CurrencyToVoteHandler},
+    traits::{
+        self as runtime_traits, BlakeTwo256, Block as BlockT, CurrencyToVoteHandler, StaticLookup,
+        Verify,
+    },
     transaction_validity::TransactionValidity,
     ApplyResult,
 };