From 80a95d843c0ec46540bf00890a71f648393a1983 Mon Sep 17 00:00:00 2001
From: Gav <gavin@parity.io>
Date: Sun, 11 Mar 2018 17:27:59 +0100
Subject: [PATCH] Fix grumbles.
---
substrate/demo/primitives/src/lib.rs | 8 --------
substrate/demo/primitives/src/transaction.rs | 9 +++++++--
substrate/demo/runtime/src/runtime/council.rs | 9 ---------
3 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/substrate/demo/primitives/src/lib.rs b/substrate/demo/primitives/src/lib.rs
index 439e6de9d8e..d47cd35cadd 100644
--- a/substrate/demo/primitives/src/lib.rs
+++ b/substrate/demo/primitives/src/lib.rs
@@ -51,11 +51,6 @@ pub use self::block::{Header, Block, Log, Digest};
pub use self::block::Number as BlockNumber;
pub use self::transaction::{Transaction, UncheckedTransaction, Function, Proposal};
-/// Virtual account ID that represents the idea of a dispatch/statement being signed by everybody
-/// (who matters). Essentially this means that a majority of validators have decided it is
-/// "correct".
-pub const EVERYBODY: AccountId = [255u8; 32];
-
/// Alias to Ed25519 pubkey that identifies an account on the relay chain. This will almost
/// certainly continue to be the same as the substrate's `AuthorityId`.
pub type AccountId = primitives::AuthorityId;
@@ -64,9 +59,6 @@ pub type AccountId = primitives::AuthorityId;
/// exactly equivalent to what the substrate calls an "authority".
pub type SessionKey = primitives::AuthorityId;
-/// Indentifier for a chain.
-pub type ChainID = u64;
-
/// Index of a transaction in the relay chain.
pub type TxOrder = u64;
diff --git a/substrate/demo/primitives/src/transaction.rs b/substrate/demo/primitives/src/transaction.rs
index ae8dd0bd551..6a3c8e83165 100644
--- a/substrate/demo/primitives/src/transaction.rs
+++ b/substrate/demo/primitives/src/transaction.rs
@@ -183,7 +183,12 @@ impl FunctionId {
use self::*;
let functions = [FunctionId::StakingStake, FunctionId::StakingUnstake,
FunctionId::StakingTransfer, FunctionId::SessionSetKey, FunctionId::TimestampSet,
- ];
+ FunctionId::CouncilVotePropose, FunctionId::CouncilVoteVote, FunctionId::CouncilVoteVeto,
+ FunctionId::CouncilSetApprovals, FunctionId::CouncilReapInactiveVoter,
+ FunctionId::CouncilRetractVoter, FunctionId::CouncilSubmitCandidacy,
+ FunctionId::CouncilPresentWinner, FunctionId::DemocracyPropose,
+ FunctionId::DemocracySecond, FunctionId::DemocracyVote,
+ ];
functions.iter().map(|&f| f).find(|&f| value == f as u8)
}
}
@@ -218,7 +223,7 @@ pub enum Function {
impl Slicable for Function {
fn decode<I: Input>(input: &mut I) -> Option<Self> {
- let id = try_opt!(u8::decode(input).and_then(FunctionId::from_u8));
+ let id = u8::decode(input).and_then(FunctionId::from_u8)?;
Some(match id {
FunctionId::TimestampSet =>
Function::TimestampSet(Slicable::decode(input)?),
diff --git a/substrate/demo/runtime/src/runtime/council.rs b/substrate/demo/runtime/src/runtime/council.rs
index 1a6ad815f90..f1e1456e77e 100644
--- a/substrate/demo/runtime/src/runtime/council.rs
+++ b/substrate/demo/runtime/src/runtime/council.rs
@@ -258,11 +258,6 @@ pub fn leaderboard() -> Option<Vec<(Balance, AccountId)>> {
pub mod public {
use super::*;
- // CouncilVotePropose(AccountId, Proposal)
- // CouncilVoteVote(AccountId, [u8; 32], bool)
- // CouncilVoteVeto(AccountId, [u8; 32])
- // CouncilSetApprovals(AccountId, Vec<bool>, u32)
- // CouncilReapInactiveVoter(AccountId, u32, AccountId, u32, u32)
/// Set candidate approvals. Approval slots stay valid as long as candidates in those slots
/// are registered.
pub fn set_approvals(signed: &AccountId, votes: &Vec<bool>, index: VoteIndex) {
@@ -359,10 +354,6 @@ pub mod public {
storage::put(&signed.to_keyed_vec(REGISTER_INFO_OF), &(vote_index(), slot));
}
- // CouncilRetractVoter(AccountId, u32)
- // CouncilSubmitCandidacy(AccountId, u32)
- // CouncilPresent(AccountId, u32)
-
/// Claim that `signed` is one of the top carry_count() + current_vote().1 candidates.
/// Only works if the block number >= current_vote().0 and < current_vote().0 + presentation_duration()
/// `signed` should have at least
--
GitLab