Skip to content

Commit

Permalink
Rename GenesisConfig fields
Browse files Browse the repository at this point in the history 
See Substrate PR: paritytech/substrate#8990
  • Loading branch information
@HCastano
HCastano committed Jun 16, 2021
1 parent 4f58d79 commit ed30c1b
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 39 deletions.
14 changes: 7 additions & 7 deletions bin/millau/node/src/chain_spec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,27 +175,27 @@ fn testnet_genesis(
_enable_println: bool,
) -> GenesisConfig {
GenesisConfig {
frame_system: SystemConfig {
system: SystemConfig {
code: WASM_BINARY.expect("Millau development WASM not available").to_vec(),
changes_trie_config: Default::default(),
},
pallet_balances: BalancesConfig {
balances: BalancesConfig {
balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 50)).collect(),
},
pallet_aura: AuraConfig {
aura: AuraConfig {
authorities: Vec::new(),
},
pallet_grandpa: GrandpaConfig {
grandpa: GrandpaConfig {
authorities: Vec::new(),
},
pallet_sudo: SudoConfig { key: root_key },
pallet_session: SessionConfig {
sudo: SudoConfig { key: root_key },
session: SessionConfig {
keys: initial_authorities
.iter()
.map(|x| (x.0.clone(), x.0.clone(), session_keys(x.1.clone(), x.2.clone())))
.collect::<Vec<_>>(),
},
pallet_bridge_grandpa_Instance1: BridgeWestendGrandpaConfig {
bridge_westend_grandpa: BridgeWestendGrandpaConfig {
// for our deployments to avoid multiple same-nonces transactions:
// //Alice is already used to initialize Rialto<->Millau bridge
// => let's use //George to initialize Westend->Millau bridge
Expand Down
22 changes: 11 additions & 11 deletions bin/rialto/node/src/chain_spec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

use bp_rialto::derive_account_from_millau_id;
use rialto_runtime::{
AccountId, AuraConfig, BalancesConfig, BridgeKovanConfig, BridgeRialtoPoAConfig, GenesisConfig, GrandpaConfig,
AccountId, AuraConfig, BalancesConfig, BridgeKovanConfig, BridgeRialtoPoaConfig, GenesisConfig, GrandpaConfig,
SessionConfig, SessionKeys, Signature, SudoConfig, SystemConfig, WASM_BINARY,
};
use serde_json::json;
Expand Down Expand Up @@ -176,23 +176,23 @@ fn testnet_genesis(
_enable_println: bool,
) -> GenesisConfig {
GenesisConfig {
frame_system: SystemConfig {
system: SystemConfig {
code: WASM_BINARY.expect("Rialto development WASM not available").to_vec(),
changes_trie_config: Default::default(),
},
pallet_balances: BalancesConfig {
balances: BalancesConfig {
balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 50)).collect(),
},
pallet_aura: AuraConfig {
aura: AuraConfig {
authorities: Vec::new(),
},
pallet_bridge_eth_poa_Instance1: load_rialto_poa_bridge_config(),
pallet_bridge_eth_poa_Instance2: load_kovan_bridge_config(),
pallet_grandpa: GrandpaConfig {
bridge_eth_poa_Instance1: load_rialto_poa_bridge_config(),
bridge_eth_poa_Instance2: load_kovan_bridge_config(),
grandpa: GrandpaConfig {
authorities: Vec::new(),
},
pallet_sudo: SudoConfig { key: root_key },
pallet_session: SessionConfig {
sudo: SudoConfig { key: root_key },
session: SessionConfig {
keys: initial_authorities
.iter()
.map(|x| (x.0.clone(), x.0.clone(), session_keys(x.1.clone(), x.2.clone())))
Expand All @@ -201,8 +201,8 @@ fn testnet_genesis(
}
}

fn load_rialto_poa_bridge_config() -> BridgeRialtoPoAConfig {
BridgeRialtoPoAConfig {
fn load_rialto_poa_bridge_config() -> BridgeRialtoPoaConfig {
BridgeRialtoPoaConfig {
initial_header: rialto_runtime::rialto_poa::genesis_header(),
initial_difficulty: 0.into(),
initial_validators: rialto_runtime::rialto_poa::genesis_validators(),
Expand Down
10 changes: 5 additions & 5 deletions bin/rialto/runtime/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ construct_runtime!(
NodeBlock = opaque::Block,
UncheckedExtrinsic = UncheckedExtrinsic
{
BridgeRialtoPoA: pallet_bridge_eth_poa::<Instance1>::{Pallet, Call, Config, Storage, ValidateUnsigned},
BridgeRialtoPoa: pallet_bridge_eth_poa::<Instance1>::{Pallet, Call, Config, Storage, ValidateUnsigned},
BridgeKovan: pallet_bridge_eth_poa::<Instance2>::{Pallet, Call, Config, Storage, ValidateUnsigned},
BridgeRialtoCurrencyExchange: pallet_bridge_currency_exchange::<Instance1>::{Pallet, Call},
BridgeKovanCurrencyExchange: pallet_bridge_currency_exchange::<Instance2>::{Pallet, Call},
Expand Down Expand Up @@ -602,21 +602,21 @@ impl_runtime_apis! {

impl bp_eth_poa::RialtoPoAHeaderApi<Block> for Runtime {
fn best_block() -> (u64, bp_eth_poa::H256) {
let best_block = BridgeRialtoPoA::best_block();
let best_block = BridgeRialtoPoa::best_block();
(best_block.number, best_block.hash)
}

fn finalized_block() -> (u64, bp_eth_poa::H256) {
let finalized_block = BridgeRialtoPoA::finalized_block();
let finalized_block = BridgeRialtoPoa::finalized_block();
(finalized_block.number, finalized_block.hash)
}

fn is_import_requires_receipts(header: bp_eth_poa::AuraHeader) -> bool {
BridgeRialtoPoA::is_import_requires_receipts(header)
BridgeRialtoPoa::is_import_requires_receipts(header)
}

fn is_known_block(hash: bp_eth_poa::H256) -> bool {
BridgeRialtoPoA::is_known_block(hash)
BridgeRialtoPoa::is_known_block(hash)
}
}

Expand Down
2 changes: 1 addition & 1 deletion bin/rialto/runtime/src/rialto_poa.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl InclusionProofVerifier for RialtoBlockchain {

fn verify_transaction_inclusion_proof(proof: &Self::TransactionInclusionProof) -> Option<Self::Transaction> {
let is_transaction_finalized =
crate::BridgeRialtoPoA::verify_transaction_finalized(proof.block, proof.index, &proof.proof);
crate::BridgeRialtoPoa::verify_transaction_finalized(proof.block, proof.index, &proof.proof);

if !is_transaction_finalized {
return None;
Expand Down
18 changes: 9 additions & 9 deletions modules/dispatch/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageVersionSpecMismatch(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageVersionSpecMismatch(
SOURCE_CHAIN_ID,
id,
TEST_SPEC_VERSION,
Expand All @@ -558,7 +558,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageWeightMismatch(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageWeightMismatch(
SOURCE_CHAIN_ID,
id,
1345000,
Expand Down Expand Up @@ -588,7 +588,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageSignatureMismatch(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageSignatureMismatch(
SOURCE_CHAIN_ID,
id
)),
Expand All @@ -610,7 +610,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageRejected(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageRejected(
SOURCE_CHAIN_ID,
id
)),
Expand All @@ -636,7 +636,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageCallDecodeFailed(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageCallDecodeFailed(
SOURCE_CHAIN_ID,
id
)),
Expand All @@ -663,7 +663,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageCallRejected(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageCallRejected(
SOURCE_CHAIN_ID,
id
)),
Expand All @@ -686,7 +686,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageDispatched(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageDispatched(
SOURCE_CHAIN_ID,
id,
Ok(())
Expand All @@ -712,7 +712,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageDispatched(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageDispatched(
SOURCE_CHAIN_ID,
id,
Ok(())
Expand All @@ -738,7 +738,7 @@ mod tests {
System::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: Event::call_dispatch(call_dispatch::Event::<TestRuntime>::MessageDispatched(
event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageDispatched(
SOURCE_CHAIN_ID,
id,
Ok(())
Expand Down
8 changes: 4 additions & 4 deletions modules/messages/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ mod tests {
System::<TestRuntime>::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: TestEvent::pallet_bridge_messages(RawEvent::MessageAccepted(TEST_LANE_ID, 1)),
event: TestEvent::Messages(RawEvent::MessageAccepted(TEST_LANE_ID, 1)),
topics: vec![],
}],
);
Expand Down Expand Up @@ -920,7 +920,7 @@ mod tests {
System::<TestRuntime>::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: TestEvent::pallet_bridge_messages(RawEvent::MessagesDelivered(TEST_LANE_ID, 1, 1)),
event: TestEvent::Messages(RawEvent::MessagesDelivered(TEST_LANE_ID, 1, 1)),
topics: vec![],
}],
);
Expand Down Expand Up @@ -1021,7 +1021,7 @@ mod tests {
System::<TestRuntime>::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: TestEvent::pallet_bridge_messages(RawEvent::ParameterUpdated(parameter)),
event: TestEvent::Messages(RawEvent::ParameterUpdated(parameter)),
topics: vec![],
}],
);
Expand All @@ -1045,7 +1045,7 @@ mod tests {
System::<TestRuntime>::events(),
vec![EventRecord {
phase: Phase::Initialization,
event: TestEvent::pallet_bridge_messages(RawEvent::ParameterUpdated(parameter)),
event: TestEvent::Messages(RawEvent::ParameterUpdated(parameter)),
topics: vec![],
}],
);
Expand Down
4 changes: 2 additions & 2 deletions relays/bin-ethereum/src/instances.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl BridgeInstance for RialtoPoA {
.collect(),
);

rialto_runtime::Call::BridgeRialtoPoA(pallet_call)
rialto_runtime::Call::BridgeRialtoPoa(pallet_call)
}

fn build_unsigned_header_call(&self, header: QueuedEthereumHeader) -> Call {
Expand All @@ -69,7 +69,7 @@ impl BridgeInstance for RialtoPoA {
into_substrate_ethereum_receipts(header.extra()),
);

rialto_runtime::Call::BridgeRialtoPoA(pallet_call)
rialto_runtime::Call::BridgeRialtoPoa(pallet_call)
}

fn build_currency_exchange_call(&self, proof: Proof) -> Call {
Expand Down

0 comments on commit ed30c1b

Please sign in to comment.