Soft deprecate GenesisConfig (#14210)

* soft deprecate genesisconfig

* temporarily add a deprecation attr

* update tests

* update mocks

* update genesis config

* update genesis config

* update genesis config

* update genesis config

* remove deprecation warning

* update deprecation comment

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Juan
2023-05-26 11:42:47 +02:00
committed by GitHub
parent de097e23fa
commit 34b2a56af1
24 changed files with 49 additions and 44 deletions
@@ -74,12 +74,16 @@ pub fn expand_outer_config(
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[serde(crate = "__genesis_config_serde_import__")]
pub struct GenesisConfig {
pub struct RuntimeGenesisConfig {
#fields
}
// GenesisConfig is in the process of being deprecated [https://github.com/paritytech/substrate/issues/14065]
#[cfg(any(feature = "std", test))]
impl #scrate::sp_runtime::BuildStorage for GenesisConfig {
pub type GenesisConfig = RuntimeGenesisConfig;
#[cfg(any(feature = "std", test))]
impl #scrate::sp_runtime::BuildStorage for RuntimeGenesisConfig {
fn assimilate_storage(
&self,
storage: &mut #scrate::sp_runtime::Storage,
+1 -1
View File
@@ -980,7 +980,7 @@ pub mod tests {
}
fn new_test_ext() -> TestExternalities {
GenesisConfig::default().build_storage().unwrap().into()
RuntimeGenesisConfig::default().build_storage().unwrap().into()
}
trait Sorted {
@@ -148,7 +148,7 @@ mod tests {
#[test]
fn value_translate_works() {
let t = GenesisConfig::default().build_storage().unwrap();
let t = RuntimeGenesisConfig::default().build_storage().unwrap();
TestExternalities::new(t).execute_with(|| {
type Value = self::frame_system::Value<Runtime>;
@@ -170,7 +170,7 @@ mod tests {
#[test]
fn map_translate_works() {
let t = GenesisConfig::default().build_storage().unwrap();
let t = RuntimeGenesisConfig::default().build_storage().unwrap();
TestExternalities::new(t).execute_with(|| {
type NumberMap = self::frame_system::NumberMap<Runtime>;
@@ -201,7 +201,7 @@ mod tests {
#[test]
fn try_mutate_works() {
let t = GenesisConfig::default().build_storage().unwrap();
let t = RuntimeGenesisConfig::default().build_storage().unwrap();
TestExternalities::new(t).execute_with(|| {
type Value = self::frame_system::Value<Runtime>;
type NumberMap = self::frame_system::NumberMap<Runtime>;
@@ -352,7 +352,7 @@ impl module3::Config for Runtime {
}
fn new_test_ext() -> sp_io::TestExternalities {
GenesisConfig {
RuntimeGenesisConfig {
module_1_1: module1::GenesisConfig { value: 3, test: 2 },
module_1_2: module1::GenesisConfig { value: 4, test: 5 },
module_2: module2::GenesisConfig {
@@ -186,7 +186,7 @@ frame_support::construct_runtime!(
#[test]
fn create_genesis_config() {
let config = GenesisConfig {
let config = RuntimeGenesisConfig {
module: module::GenesisConfig { request_life_time: 0, enable_storage_role: true },
};
assert_eq!(config.module.request_life_time, 0);