diff --git a/substrate/node/runtime/src/lib.rs b/substrate/node/runtime/src/lib.rs index c8496fa3b15337f4a7925a0cc340b3d21f1f8b60..d6014addaa527d389ea10079933abe10f6d6902f 100644 --- a/substrate/node/runtime/src/lib.rs +++ b/substrate/node/runtime/src/lib.rs @@ -48,7 +48,6 @@ use version::NativeVersion; use primitives::OpaqueMetadata; use grandpa::{AuthorityId as GrandpaId, AuthorityWeight as GrandpaWeight}; use im_online::{AuthorityId as ImOnlineId}; -use finality_tracker::{DEFAULT_REPORT_LATENCY, DEFAULT_WINDOW_SIZE}; #[cfg(any(feature = "std", test))] pub use sr_primitives::BuildStorage; @@ -81,7 +80,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // implementation changes and behavior does not, then leave spec_version as // is and increment impl_version. spec_version: 150, - impl_version: 150, + impl_version: 151, apis: RUNTIME_API_VERSIONS, }; @@ -414,8 +413,8 @@ impl grandpa::Trait for Runtime { } parameter_types! { - pub const WindowSize: BlockNumber = DEFAULT_WINDOW_SIZE.into(); - pub const ReportLatency: BlockNumber = DEFAULT_REPORT_LATENCY.into(); + pub const WindowSize: BlockNumber = 101; + pub const ReportLatency: BlockNumber = 1000; } impl finality_tracker::Trait for Runtime { diff --git a/substrate/srml/balances/src/lib.rs b/substrate/srml/balances/src/lib.rs index d3961e53c96670b0a0f6e05b8c41f941f36b14b0..e450ca64030c8c934677a81a535f8093dfdab454 100644 --- a/substrate/srml/balances/src/lib.rs +++ b/substrate/srml/balances/src/lib.rs @@ -181,12 +181,6 @@ mod tests; pub use self::imbalances::{PositiveImbalance, NegativeImbalance}; -pub const DEFAULT_EXISTENTIAL_DEPOSIT: u32 = 0; -pub const DEFAULT_TRANSFER_FEE: u32 = 0; -pub const DEFAULT_CREATION_FEE: u32 = 0; -pub const DEFAULT_TRANSACTION_BASE_FEE: u32 = 0; -pub const DEFAULT_TRANSACTION_BYTE_FEE: u32 = 0; - pub trait Subtrait<I: Instance = DefaultInstance>: system::Trait { /// The balance of an account. type Balance: Parameter + Member + SimpleArithmetic + Codec + Default + Copy + diff --git a/substrate/srml/democracy/src/lib.rs b/substrate/srml/democracy/src/lib.rs index cfac7fdfbcfe19e16842e55a11d33f39561f0c91..d4cfedc37bdb2a107a5423c18bdf4fabed359a00 100644 --- a/substrate/srml/democracy/src/lib.rs +++ b/substrate/srml/democracy/src/lib.rs @@ -174,13 +174,6 @@ impl Decode for Vote { type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as system::Trait>::AccountId>>::Balance; -pub const DEFAULT_ENACTMENT_PERIOD: u32 = 0; -pub const DEFAULT_LAUNCH_PERIOD: u32 = 0; -pub const DEFAULT_VOTING_PERIOD: u32 = 0; -pub const DEFAULT_MINIMUM_DEPOSIT: u32 = 0; -pub const DEFAULT_EMERGENCY_VOTING_PERIOD: u32 = 0; -pub const DEFAULT_COOLOFF_PERIOD: u32 = 0; - pub trait Trait: system::Trait + Sized { type Proposal: Parameter + Dispatchable<Origin=Self::Origin>; type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>; diff --git a/substrate/srml/elections/src/lib.rs b/substrate/srml/elections/src/lib.rs index a82b3fab7ef1d96810b0d44c022d5011aa539ab4..f615fdee38fdb04d64debaa62e93f587c25ae718 100644 --- a/substrate/srml/elections/src/lib.rs +++ b/substrate/srml/elections/src/lib.rs @@ -138,18 +138,8 @@ pub type VoteIndex = u32; // all three must be in sync. type ApprovalFlag = u32; -pub const APPROVAL_FLAG_MASK: ApprovalFlag = 0x8000_0000; pub const APPROVAL_FLAG_LEN: usize = 32; -pub const DEFAULT_CANDIDACY_BOND: u32 = 9; -pub const DEFAULT_VOTING_BOND: u32 = 0; -pub const DEFAULT_VOTING_FEE: u32 = 0; -pub const DEFAULT_PRESENT_SLASH_PER_VOTER: u32 = 1; -pub const DEFAULT_CARRY_COUNT: u32 = 2; -pub const DEFAULT_INACTIVE_GRACE_PERIOD: u32 = 1; -pub const DEFAULT_VOTING_PERIOD: u32 = 1000; -pub const DEFAULT_DECAY_RATIO: u32 = 24; - pub trait Trait: system::Trait { type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>; diff --git a/substrate/srml/staking/src/lib.rs b/substrate/srml/staking/src/lib.rs index 9386035e44e4f1848c11137e8f475c802b5fb2e1..a4d1ed88abfb8f61208fcf45aab3e480b666390f 100644 --- a/substrate/srml/staking/src/lib.rs +++ b/substrate/srml/staking/src/lib.rs @@ -465,9 +465,6 @@ type ExpoMap<T> = BTreeMap< Exposure<<T as system::Trait>::AccountId, BalanceOf<T>> >; -pub const DEFAULT_SESSIONS_PER_ERA: u32 = 3; -pub const DEFAULT_BONDING_DURATION: u32 = 1; - /// Means for interacting with a specialized version of the `session` trait. /// /// This is needed because `Staking` sets the `ValidatorIdOf` of the `session::Trait` diff --git a/substrate/srml/treasury/src/lib.rs b/substrate/srml/treasury/src/lib.rs index 12ef4fc14e2b137ad493495673663a5dab870011..1e709b74a613bcbe67b871580acad673164344ca 100644 --- a/substrate/srml/treasury/src/lib.rs +++ b/substrate/srml/treasury/src/lib.rs @@ -89,11 +89,6 @@ type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as system:: const MODULE_ID: ModuleId = ModuleId(*b"py/trsry"); -pub const DEFAULT_PROPOSAL_BOND: u32 = 0; -pub const DEFAULT_PROPOSAL_BOND_MINIMUM: u32 = 0; -pub const DEFAULT_SPEND_PERIOD: u32 = 0; -pub const DEFAULT_BURN: u32 = 0; - pub trait Trait: system::Trait { /// The staking balance. type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;