Build fixes.

paritytech · Dec 3, 2018 · e1853be · e1853be
1 parent 06cef2a
commit e1853be
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/...st-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm b/...st-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
diff --git a/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm b/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
diff --git a/srml/council/src/voting.rs b/srml/council/src/voting.rs
@@ -19,7 +19,7 @@
 use rstd::prelude::*;
 use rstd::borrow::Borrow;
 use codec::HasCompact;
-use primitives::traits::{Hash, As};
+use primitives::traits::{Hash, As, Zero};
 use runtime_io::print;
 use srml_support::dispatch::Result;
 use srml_support::{StorageValue, StorageMap, IsSubType};
@@ -216,8 +216,8 @@ impl<T: Trait> Module<T> {
 				if tally.0 > tally.1 + tally.2 {
 					Self::kill_veto_of(&proposal_hash);
 					match tally {
-						(_, 0, 0) => <democracy::Module<T>>::internal_start_referendum(proposal, democracy::VoteThreshold::SuperMajorityAgainst).map(|_| ())?,
-						_ => <democracy::Module<T>>::internal_start_referendum(proposal, democracy::VoteThreshold::SimpleMajority).map(|_| ())?,
+						(_, 0, 0) => <democracy::Module<T>>::internal_start_referendum(proposal, democracy::VoteThreshold::SuperMajorityAgainst, Zero::zero()).map(|_| ())?,
+						_ => <democracy::Module<T>>::internal_start_referendum(proposal, democracy::VoteThreshold::SimpleMajority, Zero::zero()).map(|_| ())?,
 					};
 				}
 			}

diff --git a/srml/democracy/src/lib.rs b/srml/democracy/src/lib.rs
@@ -350,6 +350,8 @@ impl<T: Trait> Module<T> {
 	}
 }
 
+// TODO: These should be wired-in into the runtime.
+
 impl<T: Trait> balances::OnFreeBalanceZero<T::AccountId> for Module<T> {
 	fn on_free_balance_zero(who: &T::AccountId) {
 		<Bondage<T>>::remove(who);

diff --git a/srml/grandpa/src/lib.rs b/srml/grandpa/src/lib.rs
@@ -63,13 +63,8 @@ use runtime_support::storage::unhashed::StorageVec;
 use primitives::traits::{CurrentHeight, Convert};
 use substrate_primitives::AuthorityId;
 use system::ensure_signed;
-
-#[cfg(feature = "std")]
 use primitives::traits::MaybeSerializeDebug;
 
-#[cfg(not(feature = "std"))]
-use primitives::traits::MaybeSerializeDebugButNotDeserialize;
-
 mod mock;
 mod tests;