Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Drop sc-client #1037

Merged
bkchr merged 17 commits into from
Apr 28, 2020
Merged

Drop sc-client #1037

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1bc2777
WIP
seunlanlege Apr 23, 2020
9a3f4e3
collator
seunlanlege Apr 24, 2020
cb5d326
Merge branch 'seun-the-great-client-refactor' of github.com:paritytec…
seunlanlege Apr 24, 2020
cdc486b
fix missing reference
gnunicorn Apr 24, 2020
0754148
Make collator builder more generic
gnunicorn Apr 25, 2020
ed77120
all clear
seunlanlege Apr 26, 2020
4a1e505
revert start colator fn
seunlanlege Apr 26, 2020
dd1e21c
fix return type of start_collator
seunlanlege Apr 26, 2020
0915761
sc-consensus
seunlanlege Apr 27, 2020
b0e20ec
merge with master
seunlanlege Apr 28, 2020
f70e9d2
bump back to master
seunlanlege Apr 28, 2020
aec8ac8
Update collator/src/lib.rs
seunlanlege Apr 28, 2020
75edb5f
Update collator/src/lib.rs
seunlanlege Apr 28, 2020
26b8f85
uncomment type MaxIterations
seunlanlege Apr 28, 2020
bda899c
Merge branch 'seun-the-great-client-refactor' of github.com:paritytec…
seunlanlege Apr 28, 2020
da6829e
Merge remote-tracking branch 'origin/master' into seun-the-great-clie…
gnunicorn Apr 28, 2020
1507f16
reactivate append storage feature
gnunicorn Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge with master
  • Loading branch information
@seunlanlege
seunlanlege committed Apr 28, 2020
commit b0e20ec24b63b979ed4ac7d4ea18a515a3a29060
269 changes: 130 additions & 139 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions network/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ log = "0.4.8"
parking_lot = "0.10.0"
futures = "0.3.1"
rand = "0.7.2"
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "seun-the-great-client-refactor" }
sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" }
Expand Down
3 changes: 2 additions & 1 deletion network/test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ use sp_blockchain::{
use sc_client_api::{
BlockchainEvents, BlockImportNotification,
FinalityNotifications, ImportNotifications,
FinalityNotification, LongestChain,
FinalityNotification,
client::BlockBackend,
backend::{TransactionFor, AuxStore, Backend, Finalizer},
};
use sc_consensus::LongestChain;
use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
use sp_consensus::block_validation::DefaultBlockAnnounceValidator;
use sp_consensus::import_queue::{
Expand Down
14 changes: 7 additions & 7 deletions parachain/src/wasm_executor/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,13 @@ impl sp_externalities::Externalities for ValidationExternalities {
panic!("next_storage_key: unsupported feature for parachain validation")
}

fn storage_append(
&mut self,
_key: Vec<u8>,
_value: Vec<u8>,
) {
panic!("storage_append: unsupported feature for parachain validation")
}
// fn storage_append(
// &mut self,
// _key: Vec<u8>,
// _value: Vec<u8>,
// ) {
// panic!("storage_append: unsupported feature for parachain validation")
// }

fn wipe(&mut self) {
panic!("wipe: unsupported feature for parachain validation")
Expand Down
2 changes: 1 addition & 1 deletion runtime/common/src/parachains.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@ mod tests {
type ElectionLookahead = ElectionLookahead;
type Call = Call;
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = ();
// type MaxIterations = ();
}

impl attestations::Trait for Test {
Expand Down
2 changes: 1 addition & 1 deletion runtime/common/src/registrar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ mod tests {
type ElectionLookahead = ElectionLookahead;
type Call = Call;
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = ();
// type MaxIterations = ();
}

impl timestamp::Trait for Test {
Expand Down
3 changes: 3 additions & 0 deletions runtime/kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }
utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }
vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }

frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }
pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }
pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }

runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ impl staking::Trait for Runtime {
type ElectionLookahead = ElectionLookahead;
type Call = Call;
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = MaxIterations;
// type MaxIterations = MaxIterations;
}

parameter_types! {
Expand Down
3 changes: 3 additions & 0 deletions runtime/polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }
sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }
vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }

frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }
pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }
pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }

runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ impl staking::Trait for Runtime {
type ElectionLookahead = ElectionLookahead;
type Call = Call;
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = MaxIterations;
// type MaxIterations = MaxIterations;
}

parameter_types! {
Expand Down
1 change: 1 addition & 0 deletions runtime/test-runtime/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ license = "GPL-3.0"

[dependencies]
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", features = ["test-helpers"], default-features = false }
substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" }
Expand Down
10 changes: 8 additions & 2 deletions runtime/test-runtime/client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ use sp_core::{sr25519, ChangesTrieConfiguration, map, twox_128};
use sp_core::storage::{ChildInfo, Storage, StorageChild};
use polkadot_test_runtime::genesismap::GenesisConfig;
use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, HashFor};
use sc_client_api::{LongestChain, light::{RemoteCallRequest, RemoteBodyRequest}};
use sc_consensus::LongestChain;
use sc_client_api::light::{RemoteCallRequest, RemoteBodyRequest};
use sc_service::client::{
light::{
call_executor::GenesisCallExecutor, backend as light_backend,
Expand Down Expand Up @@ -292,7 +293,12 @@ pub fn new_light() -> (
let blockchain =new_light_blockchain(storage);
let backend = new_light_backend(blockchain.clone());
let executor = new_native_executor();
let local_call_executor = LocalCallExecutor::new(backend.clone(), executor, sp_core::tasks::executor(),);
let local_call_executor = LocalCallExecutor::new(
backend.clone(),
executor,
sp_core::tasks::executor(),
Default::default()
);
let call_executor = LightExecutor::new(
backend.clone(),
local_call_executor,
Expand Down
2 changes: 1 addition & 1 deletion runtime/test-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ impl staking::Trait for Runtime {
type ElectionLookahead = ElectionLookahead;
type Call = Call;
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = MaxIterations;
// type MaxIterations = MaxIterations;
}

impl grandpa::Trait for Runtime {
Expand Down
3 changes: 3 additions & 0 deletions runtime/westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }
utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }
vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false }

frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }
pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }
pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true }

runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion runtime/westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ impl staking::Trait for Runtime {
type ElectionLookahead = ElectionLookahead;
type Call = Call;
type UnsignedPriority = StakingUnsignedPriority;
type MaxIterations = MaxIterations;
// type MaxIterations = MaxIterations;
}

parameter_types! {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.