From a215b5121e285e741d8a1ad5f0b0fb355fb07ea8 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Mon, 27 Nov 2023 19:18:40 +0100
Subject: [PATCH] fix(release): E2E tests were failing
---
end2end-tests/cucumber-genesis/default.json | 6 +++++-
end2end-tests/cucumber-genesis/wot.json | 6 +++++-
node/src/chain_spec/gen_genesis_data.rs | 9 +++++++--
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/end2end-tests/cucumber-genesis/default.json b/end2end-tests/cucumber-genesis/default.json
index 7e1c8ffda..fab39aad6 100644
--- a/end2end-tests/cucumber-genesis/default.json
+++ b/end2end-tests/cucumber-genesis/default.json
@@ -81,5 +81,9 @@
],
"treasury_funder_pubkey": "FHNpKmJrUtusuvKPGomAygQqeiks98bdV6yD61Stb6vg",
"ud": 1000,
- "initial_monetary_mass": 3000
+ "initial_monetary_mass": 3000,
+ "current_block": {
+ "number": 0,
+ "medianTime": 1700000000
+ }
}
\ No newline at end of file
diff --git a/end2end-tests/cucumber-genesis/wot.json b/end2end-tests/cucumber-genesis/wot.json
index 948b34aaa..4c7183b2a 100644
--- a/end2end-tests/cucumber-genesis/wot.json
+++ b/end2end-tests/cucumber-genesis/wot.json
@@ -90,5 +90,9 @@
],
"treasury_funder_pubkey": "FHNpKmJrUtusuvKPGomAygQqeiks98bdV6yD61Stb6vg",
"ud": 1000,
- "initial_monetary_mass": 4000
+ "initial_monetary_mass": 4000,
+ "current_block": {
+ "number": 0,
+ "medianTime": 1700000000
+ }
}
\ No newline at end of file
diff --git a/node/src/chain_spec/gen_genesis_data.rs b/node/src/chain_spec/gen_genesis_data.rs
index 7fd06a776..85499d9f2 100644
--- a/node/src/chain_spec/gen_genesis_data.rs
+++ b/node/src/chain_spec/gen_genesis_data.rs
@@ -1729,8 +1729,13 @@ fn get_genesis_input<P: Default + DeserializeOwned>(
memmap2::Mmap::map(&file)
.map_err(|e| format!("Error mmaping gen conf file `{}`: {}", config_file_path, e))?
};
- serde_yaml::from_slice::<GenesisInput<P>>(&bytes)
- .map_err(|e| format!("Error parsing gen conf file: {}", e))
+ if config_file_path.ends_with(".json") {
+ serde_json::from_slice::<GenesisInput<P>>(&bytes)
+ .map_err(|e| format!("Error parsing JSON gen conf file: {}", e))
+ } else {
+ serde_yaml::from_slice::<GenesisInput<P>>(&bytes)
+ .map_err(|e| format!("Error parsing YAML gen conf file: {}", e))
+ }
}
fn get_genesis_migration_data() -> Result<GenesisMigrationData, String> {
--
GitLab