diff --git a/Cargo.lock b/Cargo.lock
index 1d8fa6f3d062dda40cf2e1d07fb18d343293c1f6..418df7c58fb56060c380c224234602c3ff9ddbb5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -877,7 +877,6 @@ dependencies = [
"pallet-babe",
"pallet-balances",
"pallet-certification",
- "pallet-duniter-account",
"pallet-duniter-wot",
"pallet-grandpa",
"pallet-identity",
@@ -2494,7 +2493,6 @@ dependencies = [
"pallet-balances",
"pallet-certification",
"pallet-collective",
- "pallet-duniter-account",
"pallet-duniter-test-parameters",
"pallet-duniter-wot",
"pallet-grandpa",
@@ -2563,7 +2561,6 @@ dependencies = [
"pallet-balances",
"pallet-certification",
"pallet-collective",
- "pallet-duniter-account",
"pallet-duniter-test-parameters",
"pallet-duniter-wot",
"pallet-grandpa",
@@ -2857,7 +2854,6 @@ dependencies = [
"pallet-balances",
"pallet-certification",
"pallet-collective",
- "pallet-duniter-account",
"pallet-duniter-test-parameters",
"pallet-duniter-wot",
"pallet-grandpa",
@@ -5131,27 +5127,6 @@ dependencies = [
"sp-std",
]
-[[package]]
-name = "pallet-duniter-account"
-version = "3.0.0"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "log",
- "maplit",
- "pallet-balances",
- "pallet-provide-randomness",
- "pallet-treasury",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
[[package]]
name = "pallet-duniter-test-parameters"
version = "3.0.0"
diff --git a/live-tests/tests/sanity_gdev.rs b/live-tests/tests/sanity_gdev.rs
index b460968046efc7330c33e0098d01a0cddda32df9..2b6e046131e2a340a9d23fc7c34d1f49fd541c79 100644
--- a/live-tests/tests/sanity_gdev.rs
+++ b/live-tests/tests/sanity_gdev.rs
@@ -36,10 +36,8 @@ type BlockNumber = u32;
type Index = u32;
// Define gdev types
-type AccountInfo = gdev::runtime_types::frame_system::AccountInfo<
- Index,
- gdev::runtime_types::pallet_duniter_account::types::AccountData<Balance>,
->;
+type AccountInfo =
+ gdev::runtime_types::frame_system::AccountInfo<Index, pallet_balances::AccountData<Balance>>;
type IdtyData = gdev::runtime_types::common_runtime::entities::IdtyData;
type IdtyIndex = u32;
type IdtyValue =
@@ -201,15 +199,6 @@ mod verifier {
format!("Account {} has no providers nor sufficients.", account_id),
);
}
-
- if account_id.as_slice() != TREASURY_ACCOUNT_ID {
- // Rule 4: If the account is not a "special account",
- // it should have a random id or a consumer
- self.assert(
- account_info.data.random_id.is_some() || account_info.consumers > 0,
- format!("Account {} has no random_id nor consumer.", account_id),
- );
- }
}
}
diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs
index 9f5121312483736d2c1ae2f03a4beab6fab6f7b4..0c2d2b29bbf251b6d5a9dfee856c70ade3635119 100644
--- a/node/src/chain_spec/gdev.rs
+++ b/node/src/chain_spec/gdev.rs
@@ -19,15 +19,15 @@ use common_runtime::constants::*;
use common_runtime::entities::IdtyData;
use common_runtime::*;
use gdev_runtime::{
- opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig,
- BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig,
- ParametersConfig, SessionConfig, SmithsCertConfig, SmithsMembershipConfig, SudoConfig,
- SystemConfig, TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY,
+ opaque::SessionKeys, AccountId, AuthorityMembersConfig, BabeConfig, BalancesConfig, CertConfig,
+ GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, ParametersConfig, SessionConfig,
+ SmithsCertConfig, SmithsMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
+ UniversalDividendConfig, WASM_BINARY,
};
use sc_service::ChainType;
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
use sp_consensus_babe::AuthorityId as BabeId;
-use sp_core::{blake2_256, sr25519, Encode, H256};
+use sp_core::{sr25519, Encode};
use sp_finality_grandpa::AuthorityId as GrandpaId;
use sp_membership::MembershipData;
use std::collections::BTreeMap;
@@ -274,22 +274,6 @@ fn gen_genesis_for_local_chain(
// Add Wasm runtime to storage.
code: wasm_binary.to_vec(),
},
- account: AccountConfig {
- accounts: initial_identities
- .iter()
- .enumerate()
- .map(|(i, (_, owner_key))| {
- (
- owner_key.clone(),
- GenesisAccountData {
- random_id: H256(blake2_256(&(i as u32, owner_key).encode())),
- balance: first_ud,
- is_identity: true,
- },
- )
- })
- .collect(),
- },
parameters: ParametersConfig {
parameters: GenesisParameters {
babe_epoch_duration,
@@ -325,7 +309,11 @@ fn gen_genesis_for_local_chain(
.collect(),
},
balances: BalancesConfig {
- balances: Default::default(),
+ balances: initial_identities
+ .iter()
+ .enumerate()
+ .map(|(_, (_, owner_key))| (owner_key.clone(), first_ud))
+ .collect(),
},
babe: BabeConfig {
authorities: Vec::with_capacity(0),
@@ -447,13 +435,12 @@ fn genesis_data_to_gdev_genesis_conf(
// Add Wasm runtime to storage.
code: wasm_binary.to_vec(),
},
- account: AccountConfig { accounts },
parameters: ParametersConfig { parameters },
authority_discovery: Default::default(),
authority_members: AuthorityMembersConfig {
initial_authorities,
},
- balances: Default::default(),
+ balances: BalancesConfig { balances: accounts },
babe: BabeConfig {
authorities: Vec::with_capacity(0),
epoch_config: Some(common_runtime::constants::BABE_GENESIS_EPOCH_CONFIG),
diff --git a/node/src/chain_spec/gen_genesis_data.rs b/node/src/chain_spec/gen_genesis_data.rs
index 7d0d5bde10781ccfbd3af026d6310ceebc3e0178..0f90dec8384ba6ed1033e48ef1b836ba981e34d8 100644
--- a/node/src/chain_spec/gen_genesis_data.rs
+++ b/node/src/chain_spec/gen_genesis_data.rs
@@ -16,7 +16,7 @@
use common_runtime::*;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use sp_core::{blake2_256, Decode, Encode, H256};
+use sp_core::Decode;
use std::collections::BTreeMap;
type MembershipData = sp_membership::MembershipData<u32>;
@@ -25,7 +25,7 @@ const EXISTENTIAL_DEPOSIT: u64 = 200;
#[derive(Clone)]
pub struct GenesisData<Parameters: DeserializeOwned, SessionKeys: Decode> {
- pub accounts: BTreeMap<AccountId, GenesisAccountData<u64>>,
+ pub accounts: Vec<(AccountId, u64)>,
pub certs_by_receiver: BTreeMap<u32, BTreeMap<u32, Option<u32>>>,
pub first_ud: u64,
pub first_ud_reeval: u32,
@@ -157,7 +157,7 @@ where
// MONEY AND WOT //
- let mut accounts = BTreeMap::new();
+ let mut accounts = Vec::new();
let mut identities_ = Vec::with_capacity(identities.len());
let mut idty_index: u32 = 1;
let mut idty_index_of = BTreeMap::new();
@@ -168,17 +168,8 @@ where
// SIMPLE WALLETS //
- let mut wallet_index: u32 = 0;
for (pubkey, balance) in wallets {
- wallet_index += 1;
- accounts.insert(
- pubkey.clone(),
- GenesisAccountData {
- random_id: H256(blake2_256(&(wallet_index, &pubkey).encode())),
- balance,
- is_identity: false,
- },
- );
+ accounts.push((pubkey.clone(), balance));
}
// Technical Comittee //
@@ -205,14 +196,7 @@ where
//total_dust += identity.balance;
0
};
- accounts.insert(
- identity.pubkey.clone(),
- GenesisAccountData {
- random_id: H256(blake2_256(&(idty_index, &identity.pubkey).encode())),
- balance,
- is_identity: true,
- },
- );
+ accounts.push((identity.pubkey.clone(), balance));
// We must count the money under the existential deposit because what we count is
// the monetary mass created (for the revaluation of the DU)
diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs
index ac1b0b1a99a776c6d77dbaea290f4e1c902247e5..864e8bd64fcedc862804ac59e6e6134b6c37a381 100644
--- a/node/src/chain_spec/gtest.rs
+++ b/node/src/chain_spec/gtest.rs
@@ -190,14 +190,7 @@ fn gen_genesis_for_local_chain(
.iter()
.enumerate()
.map(|(i, (_, owner_key))| {
- (
- owner_key.clone(),
- GenesisAccountData {
- random_id: H256(blake2_256(&(i as u32, owner_key).encode())),
- balance: first_ud,
- is_identity: true,
- },
- )
+ (owner_key.clone(), GenesisAccountData { balance: first_ud })
})
.collect(),
},
diff --git a/primitives/duniter/src/lib.rs b/primitives/duniter/src/lib.rs
index e077fa5d82441aafb81374c0da7f4d45909b2b3e..8e4b99cc73e42e15a3e564939e13e32f5f82cfab 100644
--- a/primitives/duniter/src/lib.rs
+++ b/primitives/duniter/src/lib.rs
@@ -16,16 +16,19 @@
#![cfg_attr(not(feature = "std"), no_std)]
-/// Rules for valid identity names are defined below
-/// - Bound length to 42
-/// - accept only ascii alphanumeric or - or _
+/// Bound length; forbid trailing or double spaces; accept only ascii alphanumeric or punctuation or space
pub fn validate_idty_name(idty_name: &[u8]) -> bool {
idty_name.len() >= 3
- && idty_name.len() <= 42 // length smaller than 42
- // all characters are alphanumeric or - or _
+ && idty_name.len() <= 64
+ && idty_name[0] != 32
+ && idty_name[idty_name.len() - 1] != 32
&& idty_name
.iter()
- .all(|c| c.is_ascii_alphanumeric() || *c == b'-' || *c == b'_')
+ .all(|c| c.is_ascii_alphanumeric() || c.is_ascii_punctuation() || *c == 32)
+ && idty_name
+ .iter()
+ .zip(idty_name.iter().skip(1))
+ .all(|(c1, c2)| *c1 != 32 || *c2 != 32)
}
#[cfg(test)]
@@ -34,19 +37,12 @@ mod tests {
#[test]
fn test_validate_idty_name() {
- // --- allow
assert!(validate_idty_name(b"B0b"));
- assert!(validate_idty_name(b"lorem_ipsum-dolor-sit_amet"));
- assert!(validate_idty_name(
- b"1_______10________20________30________40_-"
- ));
- // --- disallow
- assert!(!validate_idty_name(
- b"1_______10________20________30________40_-_"
- ));
- assert!(!validate_idty_name(b"with space"));
+ assert!(validate_idty_name(b"lorem ipsum dolor-sit_amet."));
+ assert!(!validate_idty_name(b" space"));
+ assert!(!validate_idty_name(b"space "));
+ assert!(!validate_idty_name(b"double space"));
assert!(!validate_idty_name("non-ascii🌵".as_bytes()));
assert!(!validate_idty_name("ğune".as_bytes()));
- assert!(!validate_idty_name("toto!".as_bytes()));
}
}
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index b78bd44c291d866e40d9263121f47083e2af410f..256eed59451f86bcb2ece09dd2a5aecd3cfd6332 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -34,7 +34,6 @@ std = [
'pallet-babe/std',
'pallet-balances/std',
'pallet-certification/std',
- 'pallet-duniter-account/std',
'pallet-duniter-wot/std',
'pallet-grandpa/std',
'pallet-identity/std',
@@ -66,7 +65,6 @@ try-runtime = [
duniter-primitives = { path = '../../primitives/duniter', default-features = false }
pallet-authority-members = { path = '../../pallets/authority-members', default-features = false }
pallet-certification = { path = '../../pallets/certification', default-features = false }
-pallet-duniter-account = { path = '../../pallets/duniter-account', default-features = false }
pallet-duniter-wot = { path = '../../pallets/duniter-wot', default-features = false }
pallet-identity = { path = '../../pallets/identity', default-features = false }
pallet-membership = { path = '../../pallets/membership', default-features = false }
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index d03759d4cbd890271f299281e500552a5c5c5ae0..5f2c70f53d9f549d2609baa80715835ac8193d16 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -25,7 +25,7 @@ mod pallets_config;
pub mod providers;
pub mod weights;
-pub use pallet_duniter_account::GenesisAccountData;
+pub use frame_system::Account;
pub use pallet_identity::{GenesisIdty, IdtyName, IdtyStatus, IdtyValue};
pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs
index bff6616c063264fef83c6e31a39a6b16a04da4da..c8471faabe16c2c45e79d62328aa7133d0f8b6b2 100644
--- a/runtime/common/src/pallets_config.rs
+++ b/runtime/common/src/pallets_config.rs
@@ -67,7 +67,7 @@ macro_rules! pallets_config {
/// What to do if an account is fully reaped from the system.
type OnKilledAccount = ();
/// The data to be stored in an account.
- type AccountData = pallet_duniter_account::AccountData<Balance>;
+ type AccountData = pallet_balances::AccountData<Balance>;
/// Weight information for the extrinsics of this pallet.
type SystemWeightInfo = common_runtime::weights::frame_system::WeightInfo<Runtime>;
/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
@@ -98,15 +98,6 @@ macro_rules! pallets_config {
type Preimages = Preimage;
}
- // ACCOUNT //
-
- impl pallet_duniter_account::Config for Runtime {
- type AccountIdToSalt = sp_runtime::traits::ConvertInto;
- type MaxNewAccountsPerBlock = frame_support::pallet_prelude::ConstU32<1>;
- type NewAccountPrice = frame_support::traits::ConstU64<300>;
- type RuntimeEvent = RuntimeEvent;
- }
-
// BLOCK CREATION //
impl pallet_babe::Config for Runtime {
@@ -155,7 +146,7 @@ macro_rules! pallets_config {
type Balance = Balance;
type DustRemoval = Treasury;
type ExistentialDeposit = ExistentialDeposit;
- type AccountStore = Account;
+ type AccountStore = frame_system::Pallet<Runtime>;
/// The ubiquitous event type.
type RuntimeEvent = RuntimeEvent;
type WeightInfo = common_runtime::weights::pallet_balances::WeightInfo<Runtime>;
@@ -310,7 +301,7 @@ macro_rules! pallets_config {
type GetCurrentEpochIndex = GetCurrentEpochIndex<Self>;
type MaxRequests = frame_support::traits::ConstU32<100>;
type RequestPrice = frame_support::traits::ConstU64<2_000>;
- type OnFilledRandomness = Account;
+ type OnFilledRandomness = ();
type OnUnbalanced = Treasury;
type ParentBlockRandomness = pallet_babe::ParentBlockRandomness<Self>;
type RandomnessFromOneEpochAgo = pallet_babe::RandomnessFromOneEpochAgo<Self>;
diff --git a/runtime/g1/Cargo.toml b/runtime/g1/Cargo.toml
index 03f0577377cf6636695cc424b8b6aa019fae0a5a..eae2c5d298aec3dcb9a6ea004b31528ec2716620 100644
--- a/runtime/g1/Cargo.toml
+++ b/runtime/g1/Cargo.toml
@@ -44,7 +44,6 @@ std = [
'pallet-certification/std',
'pallet-collective/std',
'pallet-duniter-test-parameters/std',
- 'pallet-duniter-account/std',
'pallet-duniter-wot/std',
'pallet-grandpa/std',
'pallet-identity/std',
@@ -114,7 +113,6 @@ common-runtime = { path = "../common", default-features = false }
pallet-authority-members = { path = '../../pallets/authority-members', default-features = false }
pallet-certification = { path = '../../pallets/certification', default-features = false }
pallet-duniter-test-parameters = { path = '../../pallets/duniter-test-parameters', default-features = false }
-pallet-duniter-account = { path = '../../pallets/duniter-account', default-features = false }
pallet-duniter-wot = { path = '../../pallets/duniter-wot', default-features = false }
pallet-identity = { path = '../../pallets/identity', default-features = false }
pallet-membership = { path = '../../pallets/membership', default-features = false }
diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs
index 6adcb4d571422c4656b4a03e1fb9f605ee83fe6c..d827ab6b9591f5dfcab74715a1f909ea7ab67743 100644
--- a/runtime/g1/src/lib.rs
+++ b/runtime/g1/src/lib.rs
@@ -234,7 +234,6 @@ construct_runtime!(
{
// Basic stuff
System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
- Account: pallet_duniter_account::{Pallet, Storage, Config<T>, Event<T>} = 1,
Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 2,
// Block creation
diff --git a/runtime/gdev/Cargo.toml b/runtime/gdev/Cargo.toml
index 643fc4b03a121197620de2bd4082f32898ece4b4..0a4c03a2632f80e482b7630f3c969cedfcdfd2cf 100644
--- a/runtime/gdev/Cargo.toml
+++ b/runtime/gdev/Cargo.toml
@@ -28,7 +28,6 @@ runtime-benchmarks = [
'pallet-certification/runtime-benchmarks',
'pallet-collective/runtime-benchmarks',
'pallet-duniter-test-parameters/runtime-benchmarks',
- 'pallet-duniter-account/runtime-benchmarks',
'pallet-duniter-wot/runtime-benchmarks',
'pallet-grandpa/runtime-benchmarks',
'pallet-identity/runtime-benchmarks',
@@ -64,7 +63,6 @@ std = [
'pallet-certification/std',
'pallet-collective/std',
'pallet-duniter-test-parameters/std',
- 'pallet-duniter-account/std',
'pallet-duniter-wot/std',
'pallet-grandpa/std',
'pallet-identity/std',
@@ -138,7 +136,6 @@ common-runtime = { path = "../common", default-features = false }
pallet-authority-members = { path = '../../pallets/authority-members', default-features = false }
pallet-certification = { path = '../../pallets/certification', default-features = false }
pallet-duniter-test-parameters = { path = '../../pallets/duniter-test-parameters', default-features = false }
-pallet-duniter-account = { path = '../../pallets/duniter-account', default-features = false }
pallet-duniter-wot = { path = '../../pallets/duniter-wot', default-features = false }
pallet-identity = { path = '../../pallets/identity', default-features = false }
pallet-membership = { path = '../../pallets/membership', default-features = false }
diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs
index 9d6eb62e1d54de3bd31b5c7164c1053999149a9d..ce88531bd1c4ea61316ed03bcb537387d0c574a7 100644
--- a/runtime/gdev/src/lib.rs
+++ b/runtime/gdev/src/lib.rs
@@ -305,7 +305,6 @@ construct_runtime!(
{
// Basic stuff
System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
- Account: pallet_duniter_account::{Pallet, Storage, Config<T>, Event<T>} = 1,
Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 2,
// Block creation
diff --git a/runtime/gdev/tests/common/mod.rs b/runtime/gdev/tests/common/mod.rs
index 67278257c557871572fd7150ef4f6c5d2d028c14..0cc296bea00f535e87d34192192f532e8b873dc8 100644
--- a/runtime/gdev/tests/common/mod.rs
+++ b/runtime/gdev/tests/common/mod.rs
@@ -48,7 +48,7 @@ pub const NAMES: [&str; 6] = ["Alice", "Bob", "Charlie", "Dave", "Eve", "Ferdie"
pub struct ExtBuilder {
// endowed accounts with balances
- initial_accounts: BTreeMap<AccountId, GenesisAccountData<Balance>>,
+ initial_accounts: Vec<(AccountId, Balance)>,
initial_authorities_len: usize,
initial_identities: BTreeMap<IdtyName, AccountId>,
initial_smiths: Vec<AuthorityKeys>,
@@ -66,17 +66,8 @@ impl ExtBuilder {
assert!(initial_authorities_len <= initial_smiths_len);
let initial_accounts = (0..initial_identities_len)
- .map(|i| {
- (
- get_account_id_from_seed::<sr25519::Public>(NAMES[i]),
- GenesisAccountData {
- balance: 0,
- is_identity: true,
- random_id: H256([i as u8; 32]),
- },
- )
- })
- .collect::<BTreeMap<_, _>>();
+ .map(|i| (get_account_id_from_seed::<sr25519::Public>(NAMES[i]), 0))
+ .collect();
let initial_identities = (0..initial_identities_len)
.map(|i| {
(
@@ -122,15 +113,7 @@ impl ExtBuilder {
}
pub fn with_initial_balances(mut self, initial_balances: Vec<(AccountId, Balance)>) -> Self {
- for (account_id, balance) in initial_balances {
- self.initial_accounts
- .entry(account_id.clone())
- .or_insert(GenesisAccountData {
- random_id: H256(account_id.into()),
- ..Default::default()
- })
- .balance = balance;
- }
+ self.initial_accounts = initial_balances;
self
}
@@ -141,7 +124,7 @@ impl ExtBuilder {
pub fn build(self) -> sp_io::TestExternalities {
let Self {
- initial_accounts,
+ initial_accounts: _initial_accounts,
initial_authorities_len,
initial_identities,
initial_smiths,
@@ -169,12 +152,6 @@ impl ExtBuilder {
.assimilate_storage(&mut t)
.unwrap();*/
- pallet_duniter_account::GenesisConfig::<Runtime> {
- accounts: initial_accounts,
- }
- .assimilate_storage(&mut t)
- .unwrap();
-
pallet_duniter_test_parameters::GenesisConfig::<Runtime> { parameters }
.assimilate_storage(&mut t)
.unwrap();
@@ -323,7 +300,6 @@ pub fn run_to_block(n: u32) {
System::set_block_number(System::block_number() + 1);
// Initialize the new block
- Account::on_initialize(System::block_number());
Scheduler::on_initialize(System::block_number());
//Babe::on_initialize(System::block_number());
Authorship::on_initialize(System::block_number());
diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs
index a4068ebff6916c22b257887bfc459d3109cb9ae3..2938d7f82af423f27bd14e916d11b4e34fd7fc18 100644
--- a/runtime/gdev/tests/integration_tests.rs
+++ b/runtime/gdev/tests/integration_tests.rs
@@ -205,12 +205,6 @@ fn test_create_new_account_with_insufficient_balance() {
// to pay the "new account tax"
run_to_block(3);
- System::assert_has_event(RuntimeEvent::Account(
- pallet_duniter_account::Event::ForceDestroy {
- who: AccountKeyring::Eve.to_account_id(),
- balance: 400,
- },
- ));
System::assert_has_event(RuntimeEvent::Balances(pallet_balances::Event::Deposit {
who: Treasury::account_id(),
amount: 400,
@@ -277,12 +271,6 @@ fn test_create_new_account() {
);
assert_eq!(Balances::free_balance(Treasury::account_id()), 500);
- // A random id request should be registered
- assert_eq!(
- Account::pending_random_id_assignments(0),
- Some(AccountKeyring::Eve.to_account_id())
- );
-
// We can't remove the account until the random id is assigned
run_to_block(4);
assert_noop!(
@@ -332,12 +320,6 @@ fn test_create_new_idty() {
run_to_block(3);
let events = System::events();
assert_eq!(events.len(), 0);
-
- // A random id request should be registered
- assert_eq!(
- Account::pending_random_id_assignments(0),
- Some(AccountKeyring::Eve.to_account_id())
- );
});
}
@@ -375,10 +357,6 @@ fn test_create_new_idty_without_founds() {
Balances::free_balance(AccountKeyring::Eve.to_account_id()),
200
);
- assert_eq!(
- Account::pending_random_id_assignments(0),
- Some(AccountKeyring::Eve.to_account_id())
- );
});
}
diff --git a/runtime/gtest/Cargo.toml b/runtime/gtest/Cargo.toml
index 034ab8621934ae906a77e47db06590a885d768a6..d68d6027f71276723664d0effc9ce98c15cd6f88 100644
--- a/runtime/gtest/Cargo.toml
+++ b/runtime/gtest/Cargo.toml
@@ -44,7 +44,6 @@ std = [
'pallet-certification/std',
'pallet-collective/std',
'pallet-duniter-test-parameters/std',
- 'pallet-duniter-account/std',
'pallet-duniter-wot/std',
'pallet-grandpa/std',
'pallet-identity/std',
@@ -114,7 +113,6 @@ common-runtime = { path = "../common", default-features = false }
pallet-authority-members = { path = '../../pallets/authority-members', default-features = false }
pallet-certification = { path = '../../pallets/certification', default-features = false }
pallet-duniter-test-parameters = { path = '../../pallets/duniter-test-parameters', default-features = false }
-pallet-duniter-account = { path = '../../pallets/duniter-account', default-features = false }
pallet-duniter-wot = { path = '../../pallets/duniter-wot', default-features = false }
pallet-identity = { path = '../../pallets/identity', default-features = false }
pallet-membership = { path = '../../pallets/membership', default-features = false }
diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs
index f859943c433d6c54982d54f3e2503f326bb7f8ad..ea0c44888a8eadd364110271f66529c1955ed7ba 100644
--- a/runtime/gtest/src/lib.rs
+++ b/runtime/gtest/src/lib.rs
@@ -235,7 +235,6 @@ construct_runtime!(
{
// Basic stuff
System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
- Account: pallet_duniter_account::{Pallet, Storage, Config<T>, Event<T>} = 1,
Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 2,
// Block creation