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

Update for Substrate master (#600)

Browse Source 
* update substrate for change to palette

* change paint to palette

* update lock

* Fix missing import

* change to polkadot-master

* Use same commit hash of parity-common

* Resolve linking errors

* Rename to frame

* bump spec

* Subsume #602 and #596

* Fix DispatchInfo

* Merge `futures03` and `joe-update-to-palette` (#606)

* Change repo and branch

* Made changes

* Bumped async-std version

* Fix line width

* Bump spec_version

* Fix `run_to_block` for Crowdfund module (#603)

Probably a copy paste error.

* Bump dependencies

* Update trie-db to be inline with substrate

* Fix documentation warning

* Fix test compilation
This commit is contained in:
joe petrowski
2019-11-23 00:16:04 +01:00
committed by Gavin Wood
parent e229074f79
commit c9b1e3d959
27 changed files with 1310 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/test-parachains/adder/collator/src/main.rs
+8 -5
View File
@@ -33,6 +33,7 @@ use collator::{
InvalidHead, ParachainContext, VersionInfo, Network, BuildParachainContext, TaskExecutor,
};
use parking_lot::Mutex;
use futures::future::{Ready, ok, err};
const GENESIS: AdderHead = AdderHead {
number: 0,
@@ -57,17 +58,19 @@ struct AdderContext {
/// The parachain context.
impl ParachainContext for AdderContext {
type ProduceCandidate = Result<(BlockData, HeadData, OutgoingMessages), InvalidHead>;
type ProduceCandidate = Ready<Result<(BlockData, HeadData, OutgoingMessages), InvalidHead>>;
fn produce_candidate<I: IntoIterator<Item=(ParaId, Message)>>(
&mut self,
_relay_parent: Hash,
status: ParachainStatus,
ingress: I,
) -> Result<(BlockData, HeadData, OutgoingMessages), InvalidHead>
) -> Self::ProduceCandidate
{
let adder_head = AdderHead::decode(&mut &status.head_data.0[..])
.map_err(|_| InvalidHead)?;
let adder_head = match AdderHead::decode(&mut &status.head_data.0[..]) {
Ok(adder_head) => adder_head,
Err(_) => return err(InvalidHead)
};
let mut db = self.db.lock();
@@ -98,7 +101,7 @@ impl ParachainContext for AdderContext {
next_head.number, next_body.state.overflowing_add(next_body.add).0);
db.insert(next_head.clone(), next_body);
Ok((encoded_body, encoded_head, OutgoingMessages { outgoing_messages: Vec::new() }))
ok((encoded_body, encoded_head, OutgoingMessages { outgoing_messages: Vec::new() }))
}
}