From 2caffaae803e08a3d5b46c860e8016da023ff4ce Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Fri, 15 Dec 2023 16:07:36 +0100
Subject: [PATCH] naming: patch_name -> preset_name
---
polkadot/node/service/src/chain_spec.rs | 6 +++---
substrate/bin/utils/chain-spec-builder/src/lib.rs | 2 +-
substrate/client/chain-spec/src/chain_spec.rs | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs
index 99a080648ad..3e5415bff93 100644
--- a/polkadot/node/service/src/chain_spec.rs
+++ b/polkadot/node/service/src/chain_spec.rs
@@ -401,7 +401,7 @@ pub fn rococo_staging_testnet_config() -> Result<RococoChainSpec, String> {
.with_name("Rococo Staging Testnet")
.with_id("rococo_staging_testnet")
.with_chain_type(ChainType::Live)
- .with_genesis_config_patch_name("staging_testnet")
+ .with_genesis_config_preset_name("staging_testnet")
.with_telemetry_endpoints(
TelemetryEndpoints::new(vec![(ROCOCO_STAGING_TELEMETRY_URL.to_string(), 0)])
.expect("Rococo Staging telemetry url is valid; qed"),
@@ -667,7 +667,7 @@ pub fn rococo_development_config() -> Result<RococoChainSpec, String> {
.with_name("Development")
.with_id("rococo_dev")
.with_chain_type(ChainType::Development)
- .with_genesis_config_patch_name("development")
+ .with_genesis_config_preset_name("development")
.with_protocol_id(DEFAULT_PROTOCOL_ID)
.build())
}
@@ -737,7 +737,7 @@ pub fn rococo_local_testnet_config() -> Result<RococoChainSpec, String> {
.with_name("Rococo Local Testnet")
.with_id("rococo_local_testnet")
.with_chain_type(ChainType::Local)
- .with_genesis_config_patch_name("local_testnet")
+ .with_genesis_config_preset_name("local_testnet")
.with_protocol_id(DEFAULT_PROTOCOL_ID)
.build())
}
diff --git a/substrate/bin/utils/chain-spec-builder/src/lib.rs b/substrate/bin/utils/chain-spec-builder/src/lib.rs
index 6d6ccb9accf..39d0fb7d45b 100644
--- a/substrate/bin/utils/chain-spec-builder/src/lib.rs
+++ b/substrate/bin/utils/chain-spec-builder/src/lib.rs
@@ -262,7 +262,7 @@ pub fn generate_chain_spec_for_runtime(cmd: &CreateCmd) -> Result<String, String
let builder = match cmd.action {
GenesisBuildAction::NamedPreset(NamedPresetCmd { ref preset_name }) =>
- builder.with_genesis_config_patch_name(preset_name.clone()),
+ builder.with_genesis_config_preset_name(preset_name.clone()),
GenesisBuildAction::Patch(PatchCmd { ref patch_path }) => {
let patch = fs::read(patch_path.as_path())
.map_err(|e| format!("patch file {patch_path:?} shall be readable: {e}"))?;
diff --git a/substrate/client/chain-spec/src/chain_spec.rs b/substrate/client/chain-spec/src/chain_spec.rs
index 0f749ab7359..b02279f8b4d 100644
--- a/substrate/client/chain-spec/src/chain_spec.rs
+++ b/substrate/client/chain-spec/src/chain_spec.rs
@@ -444,7 +444,7 @@ impl<G, E, EHF> ChainSpecBuilder<G, E, EHF> {
}
/// Sets the name of runtime-provided JSON patch for runtime's GenesisConfig.
- pub fn with_genesis_config_patch_name(mut self, name: String) -> Self {
+ pub fn with_genesis_config_preset_name(mut self, name: String) -> Self {
self.genesis_build_action = GenesisBuildAction::NamedPreset(name, Default::default());
self
}
@@ -1046,7 +1046,7 @@ mod tests {
.with_name("TestName")
.with_id("test_id")
.with_chain_type(ChainType::Local)
- .with_genesis_config_patch_name("staging".to_string())
+ .with_genesis_config_preset_name("staging".to_string())
.build();
let actual = output.as_json(false).unwrap();
--
GitLab