Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

integrations-test: build_genesis_storage name fix #2232

Merged
merged 1 commit into from
Nov 8, 2023
Merged

integrations-test: build_genesis_storage name fix #2232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...hains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use sp_core::storage::Storage;

// Cumulus
use emulated_integration_tests_common::{
accounts, build_genesis_storage_legacy, collators, SAFE_XCM_VERSION,
accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
};
use parachains_common::Balance;

Expand Down Expand Up @@ -63,7 +63,7 @@ pub fn genesis() -> Storage {
..Default::default()
};

build_genesis_storage_legacy(
build_genesis_storage(
&genesis_config,
asset_hub_rococo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
)
Expand Down
4 changes: 2 additions & 2 deletions ...ains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use sp_core::storage::Storage;

// Cumulus
use emulated_integration_tests_common::{
accounts, build_genesis_storage_legacy, collators, SAFE_XCM_VERSION,
accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
};
use parachains_common::Balance;

Expand Down Expand Up @@ -59,7 +59,7 @@ pub fn genesis() -> Storage {
..Default::default()
};

build_genesis_storage_legacy(
build_genesis_storage(
&genesis_config,
asset_hub_westend_runtime::WASM_BINARY
.expect("WASM binary was not built, please build it!"),
Expand Down
4 changes: 2 additions & 2 deletions ...ins/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use sp_core::{sr25519, storage::Storage};

// Cumulus
use emulated_integration_tests_common::{
accounts, build_genesis_storage_legacy, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
accounts, build_genesis_storage, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
};
use parachains_common::Balance;

Expand Down Expand Up @@ -75,7 +75,7 @@ pub fn genesis() -> Storage {
..Default::default()
};

build_genesis_storage_legacy(
build_genesis_storage(
&genesis_config,
bridge_hub_rococo_runtime::WASM_BINARY
.expect("WASM binary was not built, please build it!"),
Expand Down
4 changes: 2 additions & 2 deletions ...ns/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use sp_core::{sr25519, storage::Storage};

// Cumulus
use emulated_integration_tests_common::{
accounts, build_genesis_storage_legacy, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
accounts, build_genesis_storage, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
};
use parachains_common::Balance;

Expand Down Expand Up @@ -67,7 +67,7 @@ pub fn genesis() -> Storage {
..Default::default()
};

build_genesis_storage_legacy(
build_genesis_storage(
&genesis_config,
bridge_hub_westend_runtime::WASM_BINARY
.expect("WASM binary was not built, please build it!"),
Expand Down
4 changes: 2 additions & 2 deletions ...lus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use sp_core::{sr25519, storage::Storage};

// Cumulus
use emulated_integration_tests_common::{
accounts, build_genesis_storage_legacy, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
accounts, build_genesis_storage, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
};
use parachains_common::Balance;

Expand Down Expand Up @@ -64,7 +64,7 @@ pub fn genesis(para_id: u32) -> Storage {
..Default::default()
};

build_genesis_storage_legacy(
build_genesis_storage(
&genesis_config,
penpal_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
)
Expand Down
6 changes: 3 additions & 3 deletions cumulus/parachains/integration-tests/emulated/chains/relays/rococo/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ use polkadot_primitives::{AssignmentId, ValidatorId};

// Cumulus
use emulated_integration_tests_common::{
accounts, build_genesis_storage_legacy, get_account_id_from_seed, get_from_seed,
get_host_config, validators,
accounts, build_genesis_storage, get_account_id_from_seed, get_from_seed, get_host_config,
validators,
};
use parachains_common::Balance;
use rococo_runtime_constants::currency::UNITS as ROC;
Expand Down Expand Up @@ -97,5 +97,5 @@ pub fn genesis() -> Storage {
..Default::default()
};

build_genesis_storage_legacy(&genesis_config, rococo_runtime::WASM_BINARY.unwrap())
build_genesis_storage(&genesis_config, rococo_runtime::WASM_BINARY.unwrap())
}
4 changes: 2 additions & 2 deletions cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use polkadot_primitives::{AssignmentId, ValidatorId};

// Cumulus
use emulated_integration_tests_common::{
accounts, build_genesis_storage_legacy, get_from_seed, get_host_config, validators,
accounts, build_genesis_storage, get_from_seed, get_host_config, validators,
};
use parachains_common::Balance;
use westend_runtime_constants::currency::UNITS as WND;
Expand Down Expand Up @@ -105,5 +105,5 @@ pub fn genesis() -> Storage {
..Default::default()
};

build_genesis_storage_legacy(&genesis_config, westend_runtime::WASM_BINARY.unwrap())
build_genesis_storage(&genesis_config, westend_runtime::WASM_BINARY.unwrap())
}
2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub fn get_host_config() -> HostConfiguration<BlockNumber> {
/// Helper function used in tests to build the genesis storage using given RuntimeGenesisConfig and
/// code Used in `legacy_vs_json_check` submods to verify storage building with JSON patch against
/// building with RuntimeGenesisConfig struct.
pub fn build_genesis_storage_legacy(builder: &dyn BuildStorage, code: &[u8]) -> Storage {
pub fn build_genesis_storage(builder: &dyn BuildStorage, code: &[u8]) -> Storage {
let mut storage = builder.build_storage().unwrap();
storage
.top
Expand Down
Loading