poanetwork
/
edge_bridge
mirror of https://github.com/poanetwork/edge_bridge.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove grandpa dep

This commit is contained in:
Drew Stone 2018-11-28 21:32:31 +02:00
parent d768b656d4
commit 09c26148e8
3 changed files with 32 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -18,8 +18,9 @@ sr-primitives = { git = "https://github.com/paritytech/substrate/", default-feat
srml-support = { git = "https://github.com/paritytech/substrate/", default-features = false }
srml-system = { git = "https://github.com/paritytech/substrate/", default-features = false }
srml-balances = { git = "https://github.com/paritytech/substrate/", default-features = false }
srml-grandpa = { git = "https://github.com/paritytech/substrate/", default-features = false }
srml-consensus = { git = "https://github.com/paritytech/substrate/", default-features = false }
srml-session = { git = "https://github.com/paritytech/substrate/", default-features = false }
srml-timestamp = { git = "https://github.com/paritytech/substrate/", default-features = false }
srml-democracy = { git = "https://github.com/paritytech/substrate/", default-features = false }
[features]
@ -37,7 +38,8 @@ std = [
"sr-primitives/std",
"srml-system/std",
"srml-balances/std",
"srml-grandpa/std",
"srml-consensus/std",
"srml-session/std",
"srml-timestamp/std",
"srml-democracy/std",
]

80
src/bridge.rs
View File

@ -35,31 +35,23 @@ extern crate sr_io as runtime_io;
extern crate srml_balances as balances;
extern crate srml_system as system;
extern crate srml_session as session;
extern crate srml_grandpa as grandpa;
use primitives::AuthorityId;
use grandpa::fg_primitives::ScheduledChange;
use democracy::{Approved, VoteThreshold};
use rstd::prelude::*;
use system::ensure_signed;
use runtime_support::{StorageValue, StorageMap, Parameter};
use runtime_support::dispatch::Result;
use runtime_support::storage::unhashed::StorageVec;
use primitives::storage::well_known_keys;
use runtime_primitives::traits::{Zero, Hash, Convert, MaybeSerializeDebug};
/// Record indices.
pub type DepositIndex = u32;
pub type WithdrawIndex = u32;
/// The log type of this crate, projected from module trait type.
pub type Log<T> = grandpa::RawLog<
<T as system::Trait>::BlockNumber,
<T as grandpa::Trait>::SessionKey,
>;
pub trait Trait: balances::Trait + grandpa::Trait {
pub trait Trait: balances::Trait + session::Trait {
/// The session key type used by authorities.
#[cfg(feature = "std")]
type SessionKey: Parameter + Default + MaybeSerializeDebug;
/// The overarching event type.
type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
}
@ -231,20 +223,12 @@ impl<T> Default for SyncedAuthorities<T> {
}
}
impl<X, T> session::OnSessionChange<X> for SyncedAuthorities<T> where
T: Trait,
T: session::Trait,
<T as session::Trait>::ConvertAccountIdToSessionKey: Convert<
<T as system::Trait>::AccountId,
<T as grandpa::Trait>::SessionKey,
>,
{
impl<X, T> session::OnSessionChange<X> for SyncedAuthorities<T> where T: Trait, T: session::Trait {
fn on_session_change(_: X, _: bool) {
let next_authorities = <session::Module<T>>::validators()
.into_iter()
.map(T::ConvertAccountIdToSessionKey::convert)
.map(|key| (key, 1)) // evenly-weighted.
.collect::<Vec<(<T as grandpa::Trait>::SessionKey, u64)>>();
.collect::<Vec<(T::AccountId, u64)>>();
// instant changes
let last_authorities = <Authorities<T>>::get();
@ -258,14 +242,13 @@ impl<X, T> session::OnSessionChange<X> for SyncedAuthorities<T> where
decl_event!(
pub enum Event<T> where <T as system::Trait>::Hash,
<T as system::Trait>::AccountId,
<T as balances::Trait>::Balance,
<T as grandpa::Trait>::SessionKey {
<T as balances::Trait>::Balance {
// Deposit event for an account, an eligible blockchain transaction hash, and quantity
Deposit(AccountId, Hash, Balance),
// Withdraw event for an account, and an amount
Withdraw(AccountId, Balance),
/// New authority set has been applied.
NewAuthorities(Vec<(SessionKey, u64)>),
NewAuthorities(Vec<(AccountId, u64)>),
}
);
@ -304,50 +287,3 @@ decl_storage! {
pub WithdrawNonceOf get(withdraw_nonce_of): map T::AccountId => u32;
}
}
/// A logs in this module.
#[cfg_attr(feature = "std", derive(Serialize, Debug))]
#[derive(Encode, Decode, PartialEq, Eq, Clone)]
pub enum RawLog<N, SessionKey> {
/// Authorities set change has been signalled. Contains the new set of authorities
/// and the delay in blocks before applying.
AuthoritiesChangeSignal(N, Vec<(SessionKey, u64)>),
}
impl<N: Clone, SessionKey> RawLog<N, SessionKey> {
/// Try to cast the log entry as a contained signal.
pub fn as_signal(&self) -> Option<(N, &[(SessionKey, u64)])> {
match *self {
RawLog::AuthoritiesChangeSignal(ref n, ref signal) => Some((n.clone(), signal)),
}
}
}
/// Logs which can be scanned by GRANDPA for authorities change events.
pub trait BridgeChangeSignal<N> {
/// Try to cast the log entry as a contained signal.
fn as_signal(&self) -> Option<ScheduledChange<N>>;
}
impl<N, SessionKey> BridgeChangeSignal<N> for RawLog<N, SessionKey>
where N: Clone, SessionKey: Clone + Into<AuthorityId>,
{
fn as_signal(&self) -> Option<ScheduledChange<N>> {
RawLog::as_signal(self).map(|(delay, next_authorities)| ScheduledChange {
delay,
next_authorities: next_authorities.iter()
.cloned()
.map(|(k, w)| (k.into(), w))
.collect(),
})
}
}
impl<T: Trait> Module<T> where AuthorityId: core::convert::From<<T as grandpa::Trait>::SessionKey> {
/// See if the digest contains any scheduled change.
pub fn scrape_digest_change(log: &Log<T>)
-> Option<ScheduledChange<T::BlockNumber>>
{
<Log<T> as BridgeChangeSignal<T::BlockNumber>>::as_signal(log)
}
}

35
src/lib.rs
View File

@ -42,8 +42,10 @@ extern crate sr_io as runtime_io;
extern crate srml_system as system;
extern crate srml_balances as balances;
extern crate srml_grandpa as grandpa;
extern crate srml_session as session;
extern crate srml_timestamp as timestamp;
extern crate srml_democracy as democracy;
extern crate srml_consensus as consensus;
// use council::{voting, motions, seats};
@ -58,19 +60,10 @@ use bridge::{Module, Trait, RawEvent};
#[cfg(test)]
mod tests {
use super::*;
use grandpa::RawLog;
use primitives::{H256, Blake2Hasher};
use runtime_primitives::{BuildStorage};
use runtime_primitives::traits::{BlakeTwo256};
use runtime_primitives::traits::{BlakeTwo256, Identity};
use runtime_primitives::testing::{Digest, DigestItem, Header};
use runtime_primitives::generic::DigestItem as GenDigestItem;
impl From<RawLog<u64, u64>> for DigestItem {
fn from(log: RawLog<u64, u64>) -> DigestItem {
GenDigestItem::Other(log.encode())
}
}
impl_outer_origin! {
pub enum Origin for Test {}
@ -80,14 +73,14 @@ mod tests {
pub enum Event for Test {
bridge<T>,
balances<T>,
grandpa<T>,
session<T>,
}
}
impl_outer_dispatch! {
pub enum Call for Test where origin: Origin {
balances::Balances,
grandpa::Grandpa,
session::Session,
}
}
@ -115,18 +108,30 @@ mod tests {
type EnsureAccountLiquid = ();
type Event = Event;
}
impl grandpa::Trait for Test {
impl consensus::Trait for Test {
const NOTE_OFFLINE_POSITION: u32 = 1;
type Log = DigestItem;
type SessionKey = u64;
type OnOfflineValidator = ();
}
impl timestamp::Trait for Test {
const TIMESTAMP_SET_POSITION: u32 = 0;
type Moment = u64;
}
impl session::Trait for Test {
type ConvertAccountIdToSessionKey = Identity;
type OnSessionChange = Bridge;
type Event = Event;
}
impl Trait for Test {
type SessionKey = u64;
type Event = Event;
}
pub type System = system::Module<Test>;
pub type Balances = balances::Module<Test>;
pub type Grandpa = grandpa::Module<Test>;
pub type Session = session::Module<Test>;
pub type Consensus = consensus::Module<Test>;
pub type Bridge = Module<Test>;
// This function basically just builds a genesis storage key/value store according to