fix(#132): fix: gtest build was failing due to rebase

node/src/chain_spec/gen_genesis_data.rs

@@ -1431,6 +1431,7 @@ fn decorate_smiths_with_identity(
         .collect()
 }
 
+#[cfg(feature = "gdev")]
 pub fn generate_genesis_data_for_local_chain<P, SK, SessionKeys: Encode, SKP>(
     initial_authorities_len: usize,
     initial_smiths_len: usize,

node/src/chain_spec/gtest.rs

@@ -15,21 +15,15 @@
 // along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>.
 
 use super::*;
-use crate::chain_spec::gen_genesis_data::{
-    CommonParameters, GenesisData, GenesisIdentity, SessionKeysProvider,
-};
+use crate::chain_spec::gen_genesis_data::{CommonParameters, GenesisIdentity, SessionKeysProvider};
 use common_runtime::constants::*;
 use common_runtime::entities::IdtyData;
 use common_runtime::*;
 use gtest_runtime::{
-    opaque::SessionKeys, opaque::SessionKeys, parameters, AccountConfig, AccountConfig, AccountId,
-    AccountId, AuthorityMembersConfig, AuthorityMembersConfig, BabeConfig, BabeConfig,
-    BalancesConfig, CertConfig, CertConfig, GenesisConfig, GenesisConfig, IdentityConfig,
-    IdentityConfig, ImOnlineId, ImOnlineId, MembershipConfig, MembershipConfig, Perbill,
-    SessionConfig, SessionConfig, SmithCertConfig, SmithCertConfig, SmithMembershipConfig,
-    SmithMembershipConfig, SudoConfig, SudoConfig, SystemConfig, SystemConfig,
-    TechnicalCommitteeConfig, TechnicalCommitteeConfig, UniversalDividendConfig,
-    UniversalDividendConfig, WASM_BINARY, WASM_BINARY,
+    opaque::SessionKeys, parameters, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig,
+    BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig,
+    Perbill, SessionConfig, SmithCertConfig, SmithMembershipConfig, SudoConfig, SystemConfig,
+    TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY,
 };
 use jsonrpsee::core::JsonValue;
 use sc_consensus_grandpa::AuthorityId as GrandpaId;
@@ -39,9 +33,6 @@ use sc_telemetry::TelemetryEndpoints;
 use serde::Deserialize;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_consensus_babe::AuthorityId as BabeId;
-use sp_core::{blake2_256, sr25519, Encode, H256};
-use sp_membership::MembershipData;
-use std::collections::BTreeMap;
 use std::{env, fs};
 
 pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig>;
@@ -94,41 +85,6 @@ fn get_parameters(_: &Option<GenesisParameters>) -> CommonParameters {
     }
 }
 
-/// Generate an authority keys.
-pub fn get_authority_keys_from_seed(s: &str) -> AuthorityKeys {
-    (
-        get_account_id_from_seed::<sr25519::Public>(s),
-        get_from_seed::<GrandpaId>(s),
-        get_from_seed::<BabeId>(s),
-        get_from_seed::<ImOnlineId>(s),
-        get_from_seed::<AuthorityDiscoveryId>(s),
-    )
-}
-/// Generate session keys
-fn get_session_keys_from_seed(s: &str) -> SessionKeys {
-    let authority_keys = get_authority_keys_from_seed(s);
-    session_keys(
-        authority_keys.1,
-        authority_keys.2,
-        authority_keys.3,
-        authority_keys.4,
-    )
-}
-/// make session keys struct
-fn session_keys(
-    grandpa: GrandpaId,
-    babe: BabeId,
-    im_online: ImOnlineId,
-    authority_discovery: AuthorityDiscoveryId,
-) -> SessionKeys {
-    SessionKeys {
-        grandpa,
-        babe,
-        im_online,
-        authority_discovery,
-    }
-}
-
 // === client specifications ===
 
 /// emulate client specifications to get them from json
@@ -278,7 +234,7 @@ fn genesis_data_to_gtest_genesis_conf(
         },
         // Necessary to initialize TotalIssuence
         balances: BalancesConfig {
-            total_issuance: monetary_mass,
+            total_issuance: initial_monetary_mass,
         },
         babe: BabeConfig {
             authorities: Vec::with_capacity(0),