Companion PR for treasury weight update (merged) Fix polkadot with substrate master (#1044)

* fix tests

* add cargo lock

* update substrate
This commit is contained in:
thiolliere authored and GitHub committed 2020-04-28 19:35:46 +02:00
1 parent 365af458af
commit 9ff3091e35
2 files changed
+134 -130

No files matched your search

+129 -129
View File
File diff suppressed because it is too large. Load diff
+5 -1
View File
@@ -566,7 +566,7 @@ mod tests {
impl_outer_origin, assert_ok, assert_noop, parameter_types,
traits::{OnInitialize, OnFinalize},
};
use frame_support::traits::Contains;
use frame_support::traits::{Contains, ContainsLengthBound};
use sp_core::H256;
use primitives::parachain::{Info as ParaInfo, Id as ParaId, Scheduling, ValidationCode};
// The testing primitives are very useful for avoiding having to work with signatures
@@ -645,6 +645,10 @@ mod tests {
#[cfg(feature = "runtime-benchmarks")]
fn add(_: &u64) { unimplemented!() }
}
impl ContainsLengthBound for Nobody {
fn min_len() -> usize { 0 }
fn max_len() -> usize { 0 }
}
impl treasury::Trait for Test {
type Currency = balances::Module<Test>;
type ApproveOrigin = system::EnsureRoot<u64>;