pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 14:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not use Option to wrap GenesisConfig fields (#8275)

Browse Source 
Currently we wrap every `GenesisConfig` field in an `Option`, while
we require `Default` being implemented for all pallet genesisconfigs.
Passing `None` also results in the genesis not being initialized, which
is a bug as seen from the perspective of a pallet developer?

This pr changes the fields of the `GenesisConfig` to non `Option` types.
This commit is contained in:
Bastian Köcher
2021-03-06 14:42:21 +01:00
committed by GitHub
parent 1680422f1f
commit b0ebf6498f
10 changed files with 111 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/src/genesis_config.rs
+10 -12
View File
@@ -82,7 +82,7 @@ macro_rules! impl_outer_config {
#[serde(deny_unknown_fields)]
pub struct $main {
$(
pub [< $snake $(_ $instance )? >]: Option<$config>,
pub [< $snake $(_ $instance )? >]: $config,
)*
}
#[cfg(any(feature = "std", test))]
@@ -92,15 +92,13 @@ macro_rules! impl_outer_config {
storage: &mut $crate::sp_runtime::Storage,
) -> std::result::Result<(), String> {
$(
if let Some(ref extra) = self.[< $snake $(_ $instance )? >] {
$crate::impl_outer_config! {
@CALL_FN
$concrete;
$snake;
$( $instance )?;
extra;
storage;
}
$crate::impl_outer_config! {
@CALL_FN
$concrete;
$snake;
$( $instance )?;
&self.[< $snake $(_ $instance )? >];
storage;
}
)*
@@ -117,7 +115,7 @@ macro_rules! impl_outer_config {
$runtime:ident;
$module:ident;
$instance:ident;
$extra:ident;
$extra:expr;
$storage:ident;
) => {
$crate::sp_runtime::BuildModuleGenesisStorage::<$runtime, $module::$instance>::build_module_genesis_storage(
@@ -129,7 +127,7 @@ macro_rules! impl_outer_config {
$runtime:ident;
$module:ident;
;
$extra:ident;
$extra:expr;
$storage:ident;
) => {
$crate::sp_runtime::BuildModuleGenesisStorage::
substrate/frame/support/test/tests/instance.rs
+10 -10
View File
@@ -291,26 +291,26 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature,
fn new_test_ext() -> sp_io::TestExternalities {
GenesisConfig{
module1_Instance1: Some(module1::GenesisConfig {
module1_Instance1: module1::GenesisConfig {
value: 3,
test: 2,
}),
module1_Instance2: Some(module1::GenesisConfig {
},
module1_Instance2: module1::GenesisConfig {
value: 4,
test: 5,
}),
module2: Some(module2::GenesisConfig {
},
module2: module2::GenesisConfig {
value: 4,
map: vec![(0, 0)],
double_map: vec![(0, 0, 0)],
}),
module2_Instance1: Some(module2::GenesisConfig {
},
module2_Instance1: module2::GenesisConfig {
value: 4,
map: vec![(0, 0)],
double_map: vec![(0, 0, 0)],
}),
module2_Instance2: None,
module2_Instance3: None,
},
module2_Instance2: Default::default(),
module2_Instance3: Default::default(),
}.build_storage().unwrap().into()
}
substrate/frame/support/test/tests/issue2219.rs
+2 -2
View File
@@ -185,9 +185,9 @@ frame_support::construct_runtime!(
#[test]
fn create_genesis_config() {
GenesisConfig {
module: Some(module::GenesisConfig {
module: module::GenesisConfig {
request_life_time: 0,
enable_storage_role: true,
})
}
};
}