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

Update to latest polkadot/substrate

Browse Source
This commit is contained in:
Bastian Köcher
2019-03-28 17:33:14 +01:00
parent 79a7868c6c
commit fe14e0730f
6 changed files with 2308 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/Cargo.lock
Generated
+949 -868
View File
File diff suppressed because it is too large Load Diff
cumulus/consensus/Cargo.toml
+8 -8
View File
@@ -7,18 +7,18 @@ edition = "2018"
[dependencies] [dependencies]
# substrate deps # substrate deps
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" } substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" } substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" } sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
# polkadot deps # polkadot deps
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-validate_block" } polkadot-service = { git = "https://github.com/paritytech/polkadot" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-validate_block" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot" }
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-validate_block" } 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 = "3.1" parity-codec = "3.1"
log = "0.4" log = "0.4"
cumulus/runtime/Cargo.toml
+8 -8
View File
@@ -6,16 +6,16 @@ edition = "2018"
[dependencies] [dependencies]
codec = { package = "parity-codec", version = "3.1", default-features = false, features = [ "derive" ] } codec = { package = "parity-codec", version = "3.1", default-features = false, features = [ "derive" ] }
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "bkchr-validate_block" } rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
runtime-primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "bkchr-validate_block" } runtime-primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
rio = { package = "sr-io", git = "https://github.com/paritytech/substrate", default-features = false, branch = "bkchr-validate_block" } rio = { package = "sr-io", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
executive = { package = "srml-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "bkchr-validate_block" } executive = { package = "srml-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
[dev-dependencies] [dev-dependencies]
keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" } keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" } primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
executor = { package = "substrate-executor", git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" } executor = { package = "substrate-executor", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
test-runtime = { package = "substrate-test-runtime", git = "https://github.com/paritytech/substrate", branch = "bkchr-validate_block" } test-runtime = { package = "substrate-test-runtime", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
[features] [features]
default = ["std"] default = ["std"]
cumulus/runtime/src/validate_block/tests.rs
+4 -4
View File
@@ -17,7 +17,7 @@
use crate::ParachainBlock; use crate::ParachainBlock;
use rio::{twox_128, TestExternalities}; use rio::{twox_128, TestExternalities};
use keyring::Keyring; use keyring::AccountKeyring;
use primitives::map; use primitives::map;
use runtime_primitives::traits::Block as BlockT; use runtime_primitives::traits::Block as BlockT;
use executor::{WasmExecutor, error::Result, wasmi::RuntimeValue::{I64, I32}}; use executor::{WasmExecutor, error::Result, wasmi::RuntimeValue::{I64, I32}};
@@ -32,7 +32,7 @@ const WASM_CODE: &'static [u8] =
fn create_witness_data() -> BTreeMap<Vec<u8>, Vec<u8>> { fn create_witness_data() -> BTreeMap<Vec<u8>, Vec<u8>> {
map![ map![
twox_128(&Keyring::Alice.to_raw_public().to_keyed_vec(b"balance:")).to_vec() => vec![111u8, 0, 0, 0, 0, 0, 0, 0] twox_128(&AccountKeyring::Alice.to_raw_public().to_keyed_vec(b"balance:")).to_vec() => vec![111u8, 0, 0, 0, 0, 0, 0, 0]
] ]
} }
@@ -71,8 +71,8 @@ fn call_validate_block(block: ParachainBlock<Block>, prev_header: <Block as Bloc
fn create_extrinsics() -> Vec<<Block as BlockT>::Extrinsic> { fn create_extrinsics() -> Vec<<Block as BlockT>::Extrinsic> {
vec![ vec![
Transfer { Transfer {
from: Keyring::Alice.to_raw_public().into(), from: AccountKeyring::Alice.into(),
to: Keyring::Bob.to_raw_public().into(), to: AccountKeyring::Bob.into(),
amount: 69, amount: 69,
nonce: 0, nonce: 0,
}.into_signed_tx() }.into_signed_tx()
cumulus/runtime/test-runtime/Cargo.toml
+2 -2
View File
@@ -6,11 +6,11 @@ edition = "2018"
[dependencies] [dependencies]
runtime = { package = "cumulus-runtime", path = "..", default-features = false } runtime = { package = "cumulus-runtime", path = "..", default-features = false }
substrate-test-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "bkchr-validate_block" } substrate-test-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
[features] [features]
default = ["std"] default = ["std"]
std = [ std = [
"runtime/std", "runtime/std",
"substrate-test-runtime/std", "substrate-test-runtime/std",
] ]
cumulus/runtime/test-runtime/wasm/Cargo.lock
Generated
+1337 -230
View File
File diff suppressed because it is too large Load Diff