Fix grumbles.

This commit is contained in:
Gav
2018-03-11 17:27:59 +01:00
parent 13bc601c14
commit 80a95d843c
3 changed files with 7 additions and 19 deletions
+7 -2
View File
@@ -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)?),