From 46ec59a41df08b668786fbff112fb1d101ed9c87 Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Mon, 8 May 2023 14:25:35 +0200
Subject: [PATCH] fix after rebase

---
 pallets/duniter-wot/src/mock.rs               |  1 -
 ... => pallet_membership_smith_membership.rs} | 30 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)
 rename runtime/common/src/weights/{pallet_membership_smiths_membership.rs => pallet_membership_smith_membership.rs} (81%)

diff --git a/pallets/duniter-wot/src/mock.rs b/pallets/duniter-wot/src/mock.rs
index c5089c60d..6b9bf90cf 100644
--- a/pallets/duniter-wot/src/mock.rs
+++ b/pallets/duniter-wot/src/mock.rs
@@ -205,7 +205,6 @@ impl pallet_membership::Config<Instance2> for Test {
     type MembershipPeriod = SmithMembershipPeriod;
     type MetaData = ();
     type OnEvent = SmithSubWot;
-    type OnEvent = SmithsSubWot;
     type PendingMembershipPeriod = SmithPendingMembershipPeriod;
     type WeightInfo = ();
     type RuntimeEvent = RuntimeEvent;
diff --git a/runtime/common/src/weights/pallet_membership_smiths_membership.rs b/runtime/common/src/weights/pallet_membership_smith_membership.rs
similarity index 81%
rename from runtime/common/src/weights/pallet_membership_smiths_membership.rs
rename to runtime/common/src/weights/pallet_membership_smith_membership.rs
index 6936df814..2ecd9b61e 100644
--- a/runtime/common/src/weights/pallet_membership_smiths_membership.rs
+++ b/runtime/common/src/weights/pallet_membership_smith_membership.rs
@@ -46,10 +46,10 @@ use sp_std::marker::PhantomData;
 /// Weight functions for `pallet_membership`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
-	// Storage: SmithsMembership PendingMembership (r:1 w:1)
-	// Storage: SmithsMembership Membership (r:1 w:0)
+	// Storage: SmithMembership PendingMembership (r:1 w:1)
+	// Storage: SmithMembership Membership (r:1 w:0)
 	// Storage: Parameters ParametersStorage (r:1 w:0)
-	// Storage: SmithsMembership PendingMembershipsExpireOn (r:1 w:1)
+	// Storage: SmithMembership PendingMembershipsExpireOn (r:1 w:1)
 	fn force_request_membership() -> Weight {
 		// Minimum execution time: 96_077 nanoseconds.
 		Weight::from_ref_time(98_570_000 as u64)
@@ -58,10 +58,10 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 	}
 	// Storage: Identity IdentityIndexOf (r:1 w:0)
 	// Storage: Identity Identities (r:1 w:0)
-	// Storage: SmithsMembership PendingMembership (r:1 w:1)
-	// Storage: SmithsMembership Membership (r:1 w:0)
+	// Storage: SmithMembership PendingMembership (r:1 w:1)
+	// Storage: SmithMembership Membership (r:1 w:0)
 	// Storage: Parameters ParametersStorage (r:1 w:0)
-	// Storage: SmithsMembership PendingMembershipsExpireOn (r:1 w:1)
+	// Storage: SmithMembership PendingMembershipsExpireOn (r:1 w:1)
 	fn request_membership() -> Weight {
 		// Minimum execution time: 122_839 nanoseconds.
 		Weight::from_ref_time(125_861_000 as u64)
@@ -69,12 +69,12 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
 	// Storage: Identity IdentityIndexOf (r:2 w:0)
-	// Storage: SmithsMembership Membership (r:2 w:1)
-	// Storage: SmithsCert StorageIdtyCertMeta (r:1 w:0)
+	// Storage: SmithMembership Membership (r:2 w:1)
+	// Storage: SmithCert StorageIdtyCertMeta (r:1 w:0)
 	// Storage: Parameters ParametersStorage (r:1 w:0)
-	// Storage: SmithsMembership PendingMembership (r:1 w:1)
-	// Storage: SmithsMembership CounterForMembership (r:1 w:1)
-	// Storage: SmithsMembership MembershipsExpireOn (r:1 w:1)
+	// Storage: SmithMembership PendingMembership (r:1 w:1)
+	// Storage: SmithMembership CounterForMembership (r:1 w:1)
+	// Storage: SmithMembership MembershipsExpireOn (r:1 w:1)
 	fn claim_membership() -> Weight {
 		// Minimum execution time: 165_369 nanoseconds.
 		Weight::from_ref_time(167_607_000 as u64)
@@ -82,10 +82,10 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().writes(4 as u64))
 	}
 	// Storage: Identity IdentityIndexOf (r:1 w:0)
-	// Storage: SmithsMembership Membership (r:1 w:1)
+	// Storage: SmithMembership Membership (r:1 w:1)
 	// Storage: Identity Identities (r:1 w:0)
 	// Storage: Parameters ParametersStorage (r:1 w:0)
-	// Storage: SmithsMembership MembershipsExpireOn (r:1 w:1)
+	// Storage: SmithMembership MembershipsExpireOn (r:1 w:1)
 	fn renew_membership() -> Weight {
 		// Minimum execution time: 121_761 nanoseconds.
 		Weight::from_ref_time(125_210_000 as u64)
@@ -93,8 +93,8 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
 	// Storage: Identity IdentityIndexOf (r:1 w:0)
-	// Storage: SmithsMembership Membership (r:1 w:1)
-	// Storage: SmithsMembership CounterForMembership (r:1 w:1)
+	// Storage: SmithMembership Membership (r:1 w:1)
+	// Storage: SmithMembership CounterForMembership (r:1 w:1)
 	// Storage: AuthorityMembers Members (r:1 w:1)
 	// Storage: AuthorityMembers OnlineAuthorities (r:1 w:1)
 	// Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1)
-- 
GitLab