pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 05:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement mark_best using set_head

Browse Source
This commit is contained in:
Robert Habermeier
2019-02-18 17:24:55 -03:00
parent b47cae17f0
commit 2ed6549530
3 changed files with 590 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+575 -419
View File
File diff suppressed because it is too large Load Diff
consensus/Cargo.toml
+1 -1
View File
@@ -20,5 +20,5 @@ polkadot-runtime = { git = "https://github.com/paritytech/polkadot" }
# other deps # other deps
futures = "0.1.21" futures = "0.1.21"
tokio = "0.1.8" tokio = "0.1.8"
parity-codec = "2.0" parity-codec = "3.0"
log = "0.4" log = "0.4"
consensus/src/lib.rs
+14 -10
View File
@@ -94,9 +94,8 @@ pub fn follow_polkadot<'a, L: 'a, P: 'a>(para_id: ParaId, local: Arc<L>, polkado
head_updates head_updates
.map_err(Error::Polkadot) .map_err(Error::Polkadot)
.and_then(|update| { .and_then(|update| -> Result<Option<<L::Block as BlockT>::Header>, _> {
Option<<L::Block as BlockT>::Header>::decode(&mut &update.head_data[..]) Decode::decode(&mut &update.head_data[..]).ok_or_else(|| Error::InvalidHeadData)
.ok_or_else(|| Error::InvalidHeadData)
}) })
.filter_map(|h| h) .filter_map(|h| h)
.for_each(move |p_head| { .for_each(move |p_head| {
@@ -110,9 +109,8 @@ pub fn follow_polkadot<'a, L: 'a, P: 'a>(para_id: ParaId, local: Arc<L>, polkado
finalized_heads finalized_heads
.map_err(Error::Polkadot) .map_err(Error::Polkadot)
.and_then(|head_data| { .and_then(|head_data| -> Result<Option<<L::Block as BlockT>::Header>, _> {
Option<<L::Block as BlockT>::Header>::decode(&mut &head_data[..]) Decode::decode(&mut &head_data[..]).ok_or_else(|| Error::InvalidHeadData)
.ok_or_else(|| Error::InvalidHeadData)
}) })
.filter_map(|h| h) .filter_map(|h| h)
.for_each(move |p_head| { .for_each(move |p_head| {
@@ -133,8 +131,14 @@ impl<B, E, Block, RA> LocalClient for Client<B, E, Block, RA> where
{ {
type Block = Block; type Block = Block;
fn mark_best(&self, _hash: <Self::Block as BlockT>::Hash) -> ClientResult<bool> { fn mark_best(&self, hash: <Self::Block as BlockT>::Hash) -> ClientResult<bool> {
Ok(true) // TODO: https://github.com/paritytech/substrate/pull/1489 match self.set_head(BlockId::hash(hash)) {
Ok(()) => Ok(true),
Err(e) => match e.kind() {
ClientErrorKind::UnknownBlock(_) => Ok(false),
_ => Err(e),
}
}
} }
fn finalize(&self, hash: <Self::Block as BlockT>::Hash) -> ClientResult<bool> { fn finalize(&self, hash: <Self::Block as BlockT>::Hash) -> ClientResult<bool> {
@@ -149,11 +153,11 @@ impl<B, E, Block, RA> LocalClient for Client<B, E, Block, RA> where
} }
fn parachain_key(para_id: ParaId) -> substrate_primitives::storage::StorageKey { fn parachain_key(para_id: ParaId) -> substrate_primitives::storage::StorageKey {
const PREFIX: &[u8] = &b"Parachains Heads"; const PREFIX: &[u8] = &*b"Parachains Heads";
para_id.using_encoded(|s| { para_id.using_encoded(|s| {
let mut v = PREFIX.to_vec(); let mut v = PREFIX.to_vec();
v.extend(s); v.extend(s);
substrate_primitives::storage;:StorageKey(v) substrate_primitives::storage::StorageKey(v)
}) })
} }