diff --git a/substrate/bin/utils/chain-spec-builder/src/lib.rs b/substrate/bin/utils/chain-spec-builder/src/lib.rs index a057dc4d75c1db6ad3ec78b12d23bc790015e878..6d6ccb9accf74a0642d935e601e57ee7c86507a9 100644 --- a/substrate/bin/utils/chain-spec-builder/src/lib.rs +++ b/substrate/bin/utils/chain-spec-builder/src/lib.rs @@ -71,7 +71,7 @@ //! Patch the runtime's default genesis config with the named preset provided by the runtime and generate the plain //! version of chain spec: //! ```text -//! chain-spec-builder create -r runtime.wasm named-patch "staging" +//! chain-spec-builder create -r runtime.wasm named-preset "staging" //! ``` //! //! _Note:_ [`GenesisBuilder::get_preset`][sp-genesis-builder-get-preset] and [`GenesisBuilder::build_state`][sp-genesis-builder-build] runtime functions are called. diff --git a/substrate/client/chain-spec/res/substrate_test_runtime_from_named_patch.json b/substrate/client/chain-spec/res/substrate_test_runtime_from_named_preset.json similarity index 100% rename from substrate/client/chain-spec/res/substrate_test_runtime_from_named_patch.json rename to substrate/client/chain-spec/res/substrate_test_runtime_from_named_preset.json diff --git a/substrate/client/chain-spec/src/chain_spec.rs b/substrate/client/chain-spec/src/chain_spec.rs index 3fc0c5c650876d5f28727fadf3da19d43a3232b8..0f749ab73591bd61b0fa5680eedc46e9c4f619be 100644 --- a/substrate/client/chain-spec/src/chain_spec.rs +++ b/substrate/client/chain-spec/src/chain_spec.rs @@ -45,7 +45,7 @@ use std::{ enum GenesisBuildAction<EHF> { Patch(json::Value), Full(json::Value), - NamedPatch(String, PhantomData<EHF>), + NamedPreset(String, PhantomData<EHF>), } impl<EHF> Clone for GenesisBuildAction<EHF> { @@ -53,7 +53,7 @@ impl<EHF> Clone for GenesisBuildAction<EHF> { match self { Self::Patch(ref p) => Self::Patch(p.clone()), Self::Full(ref f) => Self::Full(f.clone()), - Self::NamedPatch(ref p, _) => Self::NamedPatch(p.clone(), Default::default()), + Self::NamedPreset(ref p, _) => Self::NamedPreset(p.clone(), Default::default()), } } } @@ -129,7 +129,7 @@ impl<G: RuntimeGenesis, EHF: HostFunctions> GenesisSource<G, EHF> { json_blob: RuntimeGenesisConfigJson::Patch(patch.clone()), code: code.clone(), })), - Self::GenesisBuilderApi(GenesisBuildAction::NamedPatch(name, _), code) => { + Self::GenesisBuilderApi(GenesisBuildAction::NamedPreset(name, _), code) => { let patch = RuntimeCaller::<EHF>::new(&code[..]).get_named_preset(Some(name))?; Ok(Genesis::RuntimeGenesis(RuntimeGenesisInner { json_blob: RuntimeGenesisConfigJson::Patch(patch), @@ -445,7 +445,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 { - self.genesis_build_action = GenesisBuildAction::NamedPatch(name, Default::default()); + self.genesis_build_action = GenesisBuildAction::NamedPreset(name, Default::default()); self } @@ -1037,7 +1037,7 @@ mod tests { #[docify::export] #[test] - fn generate_chain_spec_with_named_patch_works() { + fn generate_chain_spec_with_named_preset_works() { sp_tracing::try_init_simple(); let output: ChainSpec<()> = ChainSpec::builder( substrate_test_runtime::wasm_binary_unwrap().into(), @@ -1059,7 +1059,7 @@ mod tests { file.write_all(actual.clone().as_bytes()).unwrap(); let expected = - from_str::<Value>(include_str!("../res/substrate_test_runtime_from_named_patch.json")) + from_str::<Value>(include_str!("../res/substrate_test_runtime_from_named_preset.json")) .unwrap(); //wasm blob may change overtime so let's zero it. Also ensure it is there: diff --git a/substrate/client/chain-spec/src/genesis_config_builder.rs b/substrate/client/chain-spec/src/genesis_config_builder.rs index c64a25448a14d4f7863f1e9bfe75bac5475f9619..bf297c4764b24605aed1ce63f5b58201ff1e5bed 100644 --- a/substrate/client/chain-spec/src/genesis_config_builder.rs +++ b/substrate/client/chain-spec/src/genesis_config_builder.rs @@ -98,11 +98,11 @@ where .call(&mut t, "GenesisBuilder_get_preset", &id.encode()) .map_err(|e| format!("wasm call error {e}"))?; - let named_patch = Option::<Vec<u8>>::decode(&mut &call_result[..]) + let named_preset = Option::<Vec<u8>>::decode(&mut &call_result[..]) .map_err(|e| format!("scale codec error: {e}"))?; - if let Some(named_patch) = named_patch { - Ok(from_slice(&named_patch[..]).expect("returned value is json. qed.")) + if let Some(named_preset) = named_preset { + Ok(from_slice(&named_preset[..]).expect("returned value is json. qed.")) } else { Err(format!("The preset with name {id:?} is not available.")) } @@ -147,7 +147,7 @@ where self.get_storage_for_config(config) } - pub fn get_storage_for_named_patch( + pub fn get_storage_for_named_preset( &self, name: Option<&String>, ) -> core::result::Result<Storage, String> { @@ -195,7 +195,7 @@ mod tests { } #[test] - fn get_named_patch_works() { + fn get_named_preset_works() { sp_tracing::try_init_simple(); let config = <GenesisConfigBuilderRuntimeCaller>::new(substrate_test_runtime::wasm_binary_unwrap())