From 6cf445b5ad292016c81b6e5755c8096ee0a6ca53 Mon Sep 17 00:00:00 2001
From: Benjamin Gallois <business@gallois.cc>
Date: Fri, 8 Dec 2023 15:55:23 +0100
Subject: [PATCH] Harmonize and document events errors and calls
(nodes/rust/duniter-v2s!200)
* fix clippy errors
* add Invalid case in distance status
* fix events pallet-membership
* fix events pallet-certification
* update docs
* update metadata and docs
* refactor errors pallet-distance
* fix distance error naming pallet duniter-wot
* add pallet membership documentation
* refactor acquisition and renewal pallet-membership
* refactor expiration and revokation pallet-membership
* refactor calls pallet-identity
* add pallet standard guidelines
* refactor events struct pallet-membership
* add events pallet-distance
* refactor documentation pallet-quota
* fix pallet-quota features
* refactor documentation pallet-provide-randomness
* refactor documentation pallet-oneshot-account
* refactor documentation pallet-offences
* refactor documentation pallet-membership
* refactor documentation pallet-identity
* refactor documentation pallet-duniter-wot
* refactor documentation pallet-duniter-account
* refactor documentation pallet-distance
* refactor documentation pallet-certification
* refactor documentation pallet-authority-members
* refactor error naming pallet-provide-randomness
* remove unused errors pallet-membership
* remove unused errors pallet-identity
* refactor events and errors pallet-distance
* refactor events and errors pallet-authority-members
---
docs/api/runtime-calls.md | 69 ++--
docs/api/runtime-errors.md | 296 +++++++-----------
docs/api/runtime-events.md | 236 ++++++--------
docs/dev/pallet_conventions.md | 35 +++
pallets/authority-members/src/benchmarking.rs | 10 +-
pallets/authority-members/src/impls.rs | 4 +-
pallets/authority-members/src/lib.rs | 73 ++---
pallets/authority-members/src/tests.rs | 10 +-
pallets/certification/src/benchmarking.rs | 6 +-
pallets/certification/src/lib.rs | 44 +--
pallets/certification/src/tests.rs | 28 +-
pallets/distance/src/benchmarking.rs | 18 +-
pallets/distance/src/lib.rs | 91 ++++--
pallets/distance/src/mock.rs | 3 +-
pallets/distance/src/types.rs | 2 +
pallets/duniter-account/src/lib.rs | 9 +-
pallets/duniter-wot/src/lib.rs | 53 ++--
pallets/duniter-wot/src/tests.rs | 103 +++---
pallets/duniter-wot/src/traits.rs | 8 +-
pallets/identity/src/benchmarking.rs | 2 +-
pallets/identity/src/lib.rs | 58 ++--
pallets/identity/src/weights.rs | 4 +-
pallets/membership/README.md | 24 +-
pallets/membership/src/benchmarking.rs | 10 +-
pallets/membership/src/lib.rs | 84 ++---
pallets/membership/src/tests.rs | 58 +++-
pallets/offences/src/lib.rs | 8 +-
pallets/oneshot-account/src/lib.rs | 17 +-
pallets/provide-randomness/src/lib.rs | 10 +-
pallets/quota/Cargo.toml | 5 +-
pallets/quota/src/lib.rs | 31 +-
primitives/membership/src/lib.rs | 18 +-
resources/metadata.scale | Bin 133159 -> 133152 bytes
runtime/common/src/handlers.rs | 13 +-
runtime/common/src/pallets_config.rs | 1 +
runtime/common/src/providers.rs | 16 +-
runtime/common/src/weights/pallet_identity.rs | 2 +-
runtime/g1/src/lib.rs | 2 +-
runtime/gdev/src/lib.rs | 2 +-
runtime/gdev/tests/fixme_tests.rs | 8 +-
runtime/gdev/tests/integration_tests.rs | 75 ++++-
runtime/gtest/src/lib.rs | 2 +-
42 files changed, 783 insertions(+), 765 deletions(-)
create mode 100644 docs/dev/pallet_conventions.md
diff --git a/docs/api/runtime-calls.md b/docs/api/runtime-calls.md
index 39d58a35a..f6b99dfcd 100644
--- a/docs/api/runtime-calls.md
+++ b/docs/api/runtime-calls.md
@@ -220,25 +220,6 @@ The dispatch origin of this call must be Signed.
transfer everything except at least the existential deposit, which will guarantee to
keep the sender account alive (true).
-#### upgrade_accounts - 6
-
-<details><summary><code>upgrade_accounts(who)</code></summary>
-
-```rust
-who: Vec<T::AccountId>
-```
-</details>
-
-
-Upgrade a specified account.
-
-- `origin`: Must be `Signed`.
-- `who`: The account to be upgraded.
-
-This will waive the transaction fee if at least all but 10% of the accounts needed to
-be upgraded. (We let some not have to be upgraded just in order to allow for the
-possibililty of churn).
-
#### transfer - 7
<details><summary><code>transfer(dest, value)</code></summary>
@@ -713,6 +694,20 @@ Revoke an identity using a revocation signature
Any signed origin can execute this call.
+#### force_remove_identity - 5
+
+<details><summary><code>force_remove_identity(idty_index, idty_name, reason)</code></summary>
+
+```rust
+idty_index: T::IdtyIndex
+idty_name: Option<IdtyName>
+reason: IdtyRemovalReason<T::IdtyRemovalOtherReason>
+```
+</details>
+
+
+remove an identity from storage
+
#### fix_sufficients - 7
<details><summary><code>fix_sufficients(owner_key, inc)</code></summary>
@@ -750,11 +745,11 @@ Link an account to an identity
</details>
-claim membership
-a pending membership should exist
-it must fullfill the requirements (certs, distance)
-for main wot claim_membership is called automatically when validating identity
-for smith wot, it means joining the authority members
+claim membership
+a pending membership should exist
+it must fullfill the requirements (certs, distance)
+for main wot claim_membership is called automatically when validating identity
+for smith wot, it means joining the authority members
#### renew_membership - 2
@@ -866,11 +861,11 @@ submit a membership request (must have a declared identity)
</details>
-claim membership
-a pending membership should exist
-it must fullfill the requirements (certs, distance)
-for main wot claim_membership is called automatically when validating identity
-for smith wot, it means joining the authority members
+claim membership
+a pending membership should exist
+it must fullfill the requirements (certs, distance)
+for main wot claim_membership is called automatically when validating identity
+for smith wot, it means joining the authority members
#### renew_membership - 2
@@ -1584,7 +1579,7 @@ exist altogether, thus there is no way it would have been approved in the first
## Root calls
-There are **20** root calls from **10** pallets.
+There are **19** root calls from **10** pallets.
### System - 0
@@ -1821,20 +1816,6 @@ O(P) where P is the number of max proposals
### Identity - 41
-#### remove_identity - 5
-
-<details><summary><code>remove_identity(idty_index, idty_name, reason)</code></summary>
-
-```rust
-idty_index: T::IdtyIndex
-idty_name: Option<IdtyName>
-reason: IdtyRemovalReason<T::IdtyRemovalOtherReason>
-```
-</details>
-
-
-remove an identity from storage
-
#### prune_item_identities_names - 6
<details><summary><code>prune_item_identities_names(names)</code></summary>
diff --git a/docs/api/runtime-errors.md b/docs/api/runtime-errors.md
index 425956424..1bb46f090 100644
--- a/docs/api/runtime-errors.md
+++ b/docs/api/runtime-errors.md
@@ -1,6 +1,6 @@
# Runtime errors
-There are **190** errors from **37** pallets.
+There are **178** errors from **37** pallets.
<ul>
<li>System - 0
@@ -220,49 +220,49 @@ Number of freezes exceed `MaxFreezes`.
<details>
<summary>
<code>BlockHeightInFuture</code> - 0</summary>
-Block height is in the future
+Block height is in the future.
</details>
</li>
<li>
<details>
<summary>
<code>BlockHeightTooOld</code> - 1</summary>
-Block height is too old
+Block height is too old.
</details>
</li>
<li>
<details>
<summary>
<code>DestAccountNotExist</code> - 2</summary>
-Destination account does not exist
+Destination account does not exist.
</details>
</li>
<li>
<details>
<summary>
<code>ExistentialDeposit</code> - 3</summary>
-Destination account has balance less than existential deposit
+Destination account has a balance less than the existential deposit.
</details>
</li>
<li>
<details>
<summary>
<code>InsufficientBalance</code> - 4</summary>
-Source account has insufficient balance
+Source account has insufficient balance.
</details>
</li>
<li>
<details>
<summary>
<code>OneshotAccountAlreadyCreated</code> - 5</summary>
-Destination oneshot account already exists
+Destination oneshot account already exists.
</details>
</li>
<li>
<details>
<summary>
<code>OneshotAccountNotExist</code> - 6</summary>
-Source oneshot account does not exist
+Source oneshot account does not exist.
</details>
</li>
</ul>
@@ -277,41 +277,41 @@ Source oneshot account does not exist
<details>
<summary>
<code>AlreadyIncoming</code> - 0</summary>
-Already incoming
+Member already incoming
</details>
</li>
<li>
<details>
<summary>
<code>AlreadyOnline</code> - 1</summary>
-Already online
+Member already online
</details>
</li>
<li>
<details>
<summary>
<code>AlreadyOutgoing</code> - 2</summary>
-Already outgoing
+Member already outgoing
</details>
</li>
<li>
<details>
<summary>
<code>MemberIdNotFound</code> - 3</summary>
-Not found owner key
+Owner key is invalid as a member.
</details>
</li>
<li>
<details>
<summary>
-<code>MemberIdBlackListed</code> - 4</summary>
+<code>MemberBlacklisted</code> - 4</summary>
Member is blacklisted
</details>
</li>
<li>
<details>
<summary>
-<code>MemberNotBlackListed</code> - 5</summary>
+<code>MemberNotBlacklisted</code> - 5</summary>
Member is not blacklisted
</details>
</li>
@@ -332,29 +332,22 @@ Neither online nor scheduled
<li>
<details>
<summary>
-<code>NotOwner</code> - 8</summary>
-Not owner
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>NotMember</code> - 9</summary>
+<code>NotMember</code> - 8</summary>
Not member
</details>
</li>
<li>
<details>
<summary>
-<code>SessionKeysNotProvided</code> - 10</summary>
+<code>SessionKeysNotProvided</code> - 9</summary>
Session keys not provided
</details>
</li>
<li>
<details>
<summary>
-<code>TooManyAuthorities</code> - 11</summary>
-Too man aAuthorities
+<code>TooManyAuthorities</code> - 10</summary>
+Too many authorities.
</details>
</li>
</ul>
@@ -639,84 +632,84 @@ This account is not allowed to claim UDs.
<details>
<summary>
<code>NotEnoughCertsToClaimMembership</code> - 0</summary>
-Not enough certifications received to claim membership
+Insufficient certifications received to claim membership.
</details>
</li>
<li>
<details>
<summary>
-<code>DistanceNotOK</code> - 1</summary>
-Distance has not been evaluated positively
+<code>DistanceNotOk</code> - 1</summary>
+Distance has not received a positive evaluation.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNotAllowedToRequestMembership</code> - 2</summary>
-Identity not allowed to request membership
+Identity is not allowed to request membership.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNotAllowedToRenewMembership</code> - 3</summary>
-Identity not allowed to renew membership
+Identity not allowed to renew membership.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyCreationPeriodNotRespected</code> - 4</summary>
-Identity creation period not respected
+Identity creation period not respected.
</details>
</li>
<li>
<details>
<summary>
<code>NotEnoughReceivedCertsToCreateIdty</code> - 5</summary>
-Not enough received certifications to create identity
+Insufficient received certifications to create identity.
</details>
</li>
<li>
<details>
<summary>
<code>MaxEmittedCertsReached</code> - 6</summary>
-Max number of emitted certs reached
+Maximum number of emitted certifications reached.
</details>
</li>
<li>
<details>
<summary>
<code>NotAllowedToChangeIdtyAddress</code> - 7</summary>
-Not allowed to change identity address
+Not allowed to change identity address.
</details>
</li>
<li>
<details>
<summary>
<code>NotAllowedToRemoveIdty</code> - 8</summary>
-Not allowed to remove identity
+Not allowed to remove identity.
</details>
</li>
<li>
<details>
<summary>
<code>IssuerCanNotEmitCert</code> - 9</summary>
-Issuer can not emit cert because it is not validated
+Issuer cannot emit a certification because it is not validated.
</details>
</li>
<li>
<details>
<summary>
<code>CertToUndefined</code> - 10</summary>
-Can not issue cert to identity without membership or pending membership
+Cannot issue a certification to an identity without membership or pending membership.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNotFound</code> - 11</summary>
-Issuer or receiver not found
+Issuer or receiver not found.
</details>
</li>
</ul>
@@ -727,147 +720,98 @@ Issuer or receiver not found
<details>
<summary>
<code>IdtyAlreadyConfirmed</code> - 0</summary>
-Identity already confirmed
+Identity already confirmed.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyAlreadyCreated</code> - 1</summary>
-Identity already created
+Identity already created.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyAlreadyValidated</code> - 2</summary>
-Identity already validated
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>IdtyCreationNotAllowed</code> - 3</summary>
-You are not allowed to create a new identity now
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>IdtyIndexNotFound</code> - 4</summary>
-Identity index not found
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>IdtyNameAlreadyExist</code> - 5</summary>
-Identity name already exists
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>IdtyNameInvalid</code> - 6</summary>
-Invalid identity name
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>IdtyNotConfirmedByOwner</code> - 7</summary>
-Identity not confirmed by its owner
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>IdtyNotFound</code> - 8</summary>
-Identity not found
+Identity already validated.
</details>
</li>
<li>
<details>
<summary>
-<code>IdtyNotMember</code> - 9</summary>
-Identity not member
+<code>IdtyIndexNotFound</code> - 3</summary>
+Identity index not found.
</details>
</li>
<li>
<details>
<summary>
-<code>IdtyNotValidated</code> - 10</summary>
-Identity not validated
+<code>IdtyNameAlreadyExist</code> - 4</summary>
+Identity name already exists.
</details>
</li>
<li>
<details>
<summary>
-<code>IdtyNotYetRenewable</code> - 11</summary>
-Identity not yet renewable
+<code>IdtyNameInvalid</code> - 5</summary>
+Invalid identity name.
</details>
</li>
<li>
<details>
<summary>
-<code>InvalidSignature</code> - 12</summary>
-payload signature is invalid
+<code>IdtyNotConfirmedByOwner</code> - 6</summary>
+Identity not confirmed by its owner.
</details>
</li>
<li>
<details>
<summary>
-<code>InvalidRevocationKey</code> - 13</summary>
-Revocation key is invalid
+<code>IdtyNotFound</code> - 7</summary>
+Identity not found.
</details>
</li>
<li>
<details>
<summary>
-<code>NotRespectIdtyCreationPeriod</code> - 14</summary>
-Identity creation period is not respected
+<code>InvalidSignature</code> - 8</summary>
+Invalid payload signature.
</details>
</li>
<li>
<details>
<summary>
-<code>NotSameIdtyName</code> - 15</summary>
-Not the same identity name
+<code>InvalidRevocationKey</code> - 9</summary>
+Invalid revocation key.
</details>
</li>
<li>
<details>
<summary>
-<code>OwnerKeyAlreadyRecentlyChanged</code> - 16</summary>
-Owner key already recently changed
+<code>NotRespectIdtyCreationPeriod</code> - 10</summary>
+Identity creation period is not respected.
</details>
</li>
<li>
<details>
<summary>
-<code>OwnerKeyAlreadyUsed</code> - 17</summary>
-Owner key already used
+<code>OwnerKeyAlreadyRecentlyChanged</code> - 11</summary>
+Owner key already changed recently.
</details>
</li>
<li>
<details>
<summary>
-<code>ProhibitedToRevertToAnOldKey</code> - 18</summary>
-Prohibited to revert to an old key
+<code>OwnerKeyAlreadyUsed</code> - 12</summary>
+Owner key already used.
</details>
</li>
<li>
<details>
<summary>
-<code>RightAlreadyAdded</code> - 19</summary>
-Right already added
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>RightNotExist</code> - 20</summary>
-Right does not exist
+<code>ProhibitedToRevertToAnOldKey</code> - 13</summary>
+Reverting to an old key is prohibited.
</details>
</li>
</ul>
@@ -878,42 +822,35 @@ Right does not exist
<details>
<summary>
<code>IdtyIdNotFound</code> - 0</summary>
-Identity id not found
+Identity ID not found.
</details>
</li>
<li>
<details>
<summary>
<code>MembershipAlreadyAcquired</code> - 1</summary>
-Membership already acquired
+Membership already acquired.
</details>
</li>
<li>
<details>
<summary>
<code>MembershipAlreadyRequested</code> - 2</summary>
-Membership already requested
+Membership already requested.
</details>
</li>
<li>
<details>
<summary>
<code>MembershipNotFound</code> - 3</summary>
-Membership not found
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>OriginNotAllowedToUseIdty</code> - 4</summary>
-Origin not allowed to use this identity
+Membership not found.
</details>
</li>
<li>
<details>
<summary>
-<code>MembershipRequestNotFound</code> - 5</summary>
-Membership request not found
+<code>MembershipRequestNotFound</code> - 4</summary>
+Membership request not found.
</details>
</li>
</ul>
@@ -924,14 +861,14 @@ Membership request not found
<details>
<summary>
<code>CannotCertifySelf</code> - 0</summary>
-An identity cannot certify itself
+Identity cannot certify itself
</details>
</li>
<li>
<details>
<summary>
<code>IssuedTooManyCert</code> - 1</summary>
-This identity has already issued the maximum number of certifications
+Identity has already issued the maximum number of certifications
</details>
</li>
<li>
@@ -945,14 +882,14 @@ Issuer not found
<details>
<summary>
<code>NotEnoughCertReceived</code> - 3</summary>
-Not enough certifications received
+Insufficient certifications received.
</details>
</li>
<li>
<details>
<summary>
<code>NotRespectCertPeriod</code> - 4</summary>
-This identity has already issued a certification too recently
+Identity has issued a certification too recently.
</details>
</li>
</ul>
@@ -963,70 +900,56 @@ This identity has already issued a certification too recently
<details>
<summary>
<code>AlreadyInEvaluation</code> - 0</summary>
-
+Distance is already under evaluation.
</details>
</li>
<li>
<details>
<summary>
-<code>CannotReserve</code> - 1</summary>
-
+<code>TooManyEvaluationsByAuthor</code> - 1</summary>
+Too many evaluations requested by author.
</details>
</li>
<li>
<details>
<summary>
-<code>ManyEvaluationsByAuthor</code> - 2</summary>
-
+<code>TooManyEvaluationsInBlock</code> - 2</summary>
+Too many evaluations for this block.
</details>
</li>
<li>
<details>
<summary>
-<code>ManyEvaluationsInBlock</code> - 3</summary>
-
+<code>NoAuthor</code> - 3</summary>
+No author for this block.
</details>
</li>
<li>
<details>
<summary>
-<code>NoAuthor</code> - 4</summary>
-
+<code>NoIdentity</code> - 4</summary>
+Caller has no identity.
</details>
</li>
<li>
<details>
<summary>
-<code>NoIdentity</code> - 5</summary>
-
+<code>QueueFull</code> - 5</summary>
+Evaluation queue is full.
</details>
</li>
<li>
<details>
<summary>
-<code>NonEligibleForEvaluation</code> - 6</summary>
-
+<code>TooManyEvaluators</code> - 6</summary>
+Too many evaluators in the current evaluation pool.
</details>
</li>
<li>
<details>
<summary>
-<code>QueueFull</code> - 7</summary>
-
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>TooManyEvaluators</code> - 8</summary>
-
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>WrongResultLength</code> - 9</summary>
-
+<code>WrongResultLength</code> - 7</summary>
+Evaluation result has a wrong length.
</details>
</li>
</ul>
@@ -1037,84 +960,84 @@ This identity has already issued a certification too recently
<details>
<summary>
<code>NotEnoughCertsToClaimMembership</code> - 0</summary>
-Not enough certifications received to claim membership
+Insufficient certifications received to claim membership.
</details>
</li>
<li>
<details>
<summary>
-<code>DistanceNotOK</code> - 1</summary>
-Distance has not been evaluated positively
+<code>DistanceNotOk</code> - 1</summary>
+Distance has not received a positive evaluation.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNotAllowedToRequestMembership</code> - 2</summary>
-Identity not allowed to request membership
+Identity is not allowed to request membership.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNotAllowedToRenewMembership</code> - 3</summary>
-Identity not allowed to renew membership
+Identity not allowed to renew membership.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyCreationPeriodNotRespected</code> - 4</summary>
-Identity creation period not respected
+Identity creation period not respected.
</details>
</li>
<li>
<details>
<summary>
<code>NotEnoughReceivedCertsToCreateIdty</code> - 5</summary>
-Not enough received certifications to create identity
+Insufficient received certifications to create identity.
</details>
</li>
<li>
<details>
<summary>
<code>MaxEmittedCertsReached</code> - 6</summary>
-Max number of emitted certs reached
+Maximum number of emitted certifications reached.
</details>
</li>
<li>
<details>
<summary>
<code>NotAllowedToChangeIdtyAddress</code> - 7</summary>
-Not allowed to change identity address
+Not allowed to change identity address.
</details>
</li>
<li>
<details>
<summary>
<code>NotAllowedToRemoveIdty</code> - 8</summary>
-Not allowed to remove identity
+Not allowed to remove identity.
</details>
</li>
<li>
<details>
<summary>
<code>IssuerCanNotEmitCert</code> - 9</summary>
-Issuer can not emit cert because it is not validated
+Issuer cannot emit a certification because it is not validated.
</details>
</li>
<li>
<details>
<summary>
<code>CertToUndefined</code> - 10</summary>
-Can not issue cert to identity without membership or pending membership
+Cannot issue a certification to an identity without membership or pending membership.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNotFound</code> - 11</summary>
-Issuer or receiver not found
+Issuer or receiver not found.
</details>
</li>
</ul>
@@ -1125,42 +1048,35 @@ Issuer or receiver not found
<details>
<summary>
<code>IdtyIdNotFound</code> - 0</summary>
-Identity id not found
+Identity ID not found.
</details>
</li>
<li>
<details>
<summary>
<code>MembershipAlreadyAcquired</code> - 1</summary>
-Membership already acquired
+Membership already acquired.
</details>
</li>
<li>
<details>
<summary>
<code>MembershipAlreadyRequested</code> - 2</summary>
-Membership already requested
+Membership already requested.
</details>
</li>
<li>
<details>
<summary>
<code>MembershipNotFound</code> - 3</summary>
-Membership not found
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>OriginNotAllowedToUseIdty</code> - 4</summary>
-Origin not allowed to use this identity
+Membership not found.
</details>
</li>
<li>
<details>
<summary>
-<code>MembershipRequestNotFound</code> - 5</summary>
-Membership request not found
+<code>MembershipRequestNotFound</code> - 4</summary>
+Membership request not found.
</details>
</li>
</ul>
@@ -1171,14 +1087,14 @@ Membership request not found
<details>
<summary>
<code>CannotCertifySelf</code> - 0</summary>
-An identity cannot certify itself
+Identity cannot certify itself
</details>
</li>
<li>
<details>
<summary>
<code>IssuedTooManyCert</code> - 1</summary>
-This identity has already issued the maximum number of certifications
+Identity has already issued the maximum number of certifications
</details>
</li>
<li>
@@ -1192,14 +1108,14 @@ Issuer not found
<details>
<summary>
<code>NotEnoughCertReceived</code> - 3</summary>
-Not enough certifications received
+Insufficient certifications received.
</details>
</li>
<li>
<details>
<summary>
<code>NotRespectCertPeriod</code> - 4</summary>
-This identity has already issued a certification too recently
+Identity has issued a certification too recently.
</details>
</li>
</ul>
@@ -1371,8 +1287,8 @@ The data to be stored is already stored.
<li>
<details>
<summary>
-<code>FullQueue</code> - 0</summary>
-The queue is full, pleasy retry later
+<code>QueueFull</code> - 0</summary>
+Request randomness queue is full.
</details>
</li>
</ul>
diff --git a/docs/api/runtime-events.md b/docs/api/runtime-events.md
index e8f92c641..ab06c6d7a 100644
--- a/docs/api/runtime-events.md
+++ b/docs/api/runtime-events.md
@@ -1,6 +1,6 @@
# Runtime events
-There are **130** events from **37** pallets.
+There are **129** events from **37** pallets.
<ul>
<li>System - 0
@@ -87,9 +87,7 @@ hash: T::Hash
<details>
<summary>
<code>ForceDestroy(who, balance)</code> - 0</summary>
-Force the destruction of an account because its free balance is insufficient to pay
-the account creation price.
-[who, balance]
+Forced destruction of an account due to insufficient free balance to cover the account creation price.
```rust
who: T::AccountId
@@ -102,8 +100,7 @@ balance: T::Balance
<details>
<summary>
<code>RandomIdAssigned(who, random_id)</code> - 1</summary>
-Random id assigned
-[account_id, random_id]
+A random ID has been assigned to the account.
```rust
who: T::AccountId
@@ -129,7 +126,7 @@ identity: IdtyIdOf<T>
<details>
<summary>
<code>AccountUnlinked()</code> - 3</summary>
-account unlinked from identity
+The account was unlinked from its identity.
```rust
: T::AccountId
@@ -538,7 +535,7 @@ tip: BalanceOf<T>
<details>
<summary>
<code>OneshotAccountCreated(account, balance, creator)</code> - 0</summary>
-
+A oneshot account was created.
```rust
account: T::AccountId
@@ -552,7 +549,7 @@ creator: T::AccountId
<details>
<summary>
<code>OneshotAccountConsumed(account, dest1, dest2)</code> - 1</summary>
-
+A oneshot account was consumed.
```rust
account: T::AccountId
@@ -568,7 +565,7 @@ dest2: Option<
<details>
<summary>
<code>Withdraw(account, balance)</code> - 2</summary>
-
+A withdrawal was executed on a oneshot account.
```rust
account: T::AccountId
@@ -585,7 +582,7 @@ balance: <T::Currency as Currency<T::AccountId>>::Balance
<details>
<summary>
<code>Refunded(who, identity, amount)</code> - 0</summary>
-Refunded fees to an account
+Transaction fees were refunded.
```rust
who: T::AccountId
@@ -599,7 +596,7 @@ amount: BalanceOf<T>
<details>
<summary>
<code>NoQuotaForIdty()</code> - 1</summary>
-No quota for identity
+No more quota available for refund.
```rust
: IdtyId<T>
@@ -611,7 +608,8 @@ No quota for identity
<details>
<summary>
<code>NoMoreCurrencyForRefund()</code> - 2</summary>
-No more currency available for refund
+No more currency available for refund.
+This scenario should never occur if the fees are intended for the refund account.
```rust
no args
@@ -623,7 +621,8 @@ no args
<details>
<summary>
<code>RefundFailed()</code> - 3</summary>
-Refund failed
+The refund has failed.
+This scenario should rarely occur, except when the account was destroyed in the interim between the request and the refund.
```rust
: T::AccountId
@@ -635,7 +634,7 @@ Refund failed
<details>
<summary>
<code>RefundQueueFull()</code> - 4</summary>
-Refund queue full
+Refund queue was full.
```rust
no args
@@ -650,12 +649,11 @@ no args
<li>
<details>
<summary>
-<code>IncomingAuthorities()</code> - 0</summary>
-List of members who will enter the set of authorities at the next session.
-[Vec<member_id>]
+<code>IncomingAuthorities(members)</code> - 0</summary>
+List of members scheduled to join the set of authorities in the next session.
```rust
-: Vec<T::MemberId>
+members: Vec<T::MemberId>
```
</details>
@@ -663,12 +661,11 @@ List of members who will enter the set of authorities at the next session.
<li>
<details>
<summary>
-<code>OutgoingAuthorities()</code> - 1</summary>
-List of members who will leave the set of authorities at the next session.
-[Vec<member_id>]
+<code>OutgoingAuthorities(members)</code> - 1</summary>
+List of members leaving the set of authorities in the next session.
```rust
-: Vec<T::MemberId>
+members: Vec<T::MemberId>
```
</details>
@@ -676,12 +673,11 @@ List of members who will leave the set of authorities at the next session.
<li>
<details>
<summary>
-<code>MemberGoOffline()</code> - 2</summary>
+<code>MemberGoOffline(member)</code> - 2</summary>
A member will leave the set of authorities in 2 sessions.
-[member_id]
```rust
-: T::MemberId
+member: T::MemberId
```
</details>
@@ -689,12 +685,11 @@ A member will leave the set of authorities in 2 sessions.
<li>
<details>
<summary>
-<code>MemberGoOnline()</code> - 3</summary>
-A member will enter the set of authorities in 2 sessions.
-[member_id]
+<code>MemberGoOnline(member)</code> - 3</summary>
+A member will join the set of authorities in 2 sessions.
```rust
-: T::MemberId
+member: T::MemberId
```
</details>
@@ -702,13 +697,11 @@ A member will enter the set of authorities in 2 sessions.
<li>
<details>
<summary>
-<code>MemberRemoved()</code> - 4</summary>
-A member has lost the right to be part of the authorities,
-this member will be removed from the authority set in 2 sessions.
-[member_id]
+<code>MemberRemoved(member)</code> - 4</summary>
+A member, who no longer has authority rights, will be removed from the authority set in 2 sessions.
```rust
-: T::MemberId
+member: T::MemberId
```
</details>
@@ -716,12 +709,11 @@ this member will be removed from the authority set in 2 sessions.
<li>
<details>
<summary>
-<code>MemberRemovedFromBlackList()</code> - 5</summary>
+<code>MemberRemovedFromBlacklist(member)</code> - 5</summary>
A member has been removed from the blacklist.
-[member_id]
```rust
-: T::MemberId
+member: T::MemberId
```
</details>
@@ -738,9 +730,7 @@ A member has been removed from the blacklist.
<details>
<summary>
<code>Offence(kind, timeslot)</code> - 0</summary>
-There is an offence reported of the given `kind` happened at the `session_index` and
-(kind-specific) time slot. This event is not deposited for duplicate slashes.
-\[kind, timeslot\].
+An offense was reported during the specified time slot. This event is not deposited for duplicate slashes.
```rust
kind: Kind
@@ -1124,8 +1114,7 @@ who: T::AccountId
<details>
<summary>
<code>IdtyCreated(idty_index, owner_key)</code> - 0</summary>
-A new identity has been created
-[idty_index, owner_key]
+A new identity has been created.
```rust
idty_index: T::IdtyIndex
@@ -1138,8 +1127,7 @@ owner_key: T::AccountId
<details>
<summary>
<code>IdtyConfirmed(idty_index, owner_key, name)</code> - 1</summary>
-An identity has been confirmed by its owner
-[idty_index, owner_key, name]
+An identity has been confirmed by its owner.
```rust
idty_index: T::IdtyIndex
@@ -1153,8 +1141,7 @@ name: IdtyName
<details>
<summary>
<code>IdtyValidated(idty_index)</code> - 2</summary>
-An identity has been validated
-[idty_index]
+An identity has been validated.
```rust
idty_index: T::IdtyIndex
@@ -1179,8 +1166,7 @@ new_owner_key: T::AccountId
<details>
<summary>
<code>IdtyRemoved(idty_index, reason)</code> - 4</summary>
-An identity has been removed
-[idty_index]
+An identity has been removed.
```rust
idty_index: T::IdtyIndex
@@ -1196,25 +1182,12 @@ reason: IdtyRemovalReason<T::IdtyRemovalOtherReason>
<li>
<details>
<summary>
-<code>MembershipAcquired()</code> - 0</summary>
-A membership was acquired
-[idty_id]
-
-```rust
-: T::IdtyId
-```
-
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>MembershipExpired()</code> - 1</summary>
-A membership expired
-[idty_id]
+<code>MembershipAcquired(member, expire_on)</code> - 0</summary>
+A membership was acquired.
```rust
-: T::IdtyId
+member: T::IdtyId
+expire_on: BlockNumberFor<T>
```
</details>
@@ -1222,12 +1195,12 @@ A membership expired
<li>
<details>
<summary>
-<code>MembershipRenewed()</code> - 2</summary>
-A membership was renewed
-[idty_id]
+<code>MembershipTerminated(member, reason)</code> - 1</summary>
+A membership was terminated.
```rust
-: T::IdtyId
+member: T::IdtyId
+reason: MembershipTerminationReason
```
</details>
@@ -1235,12 +1208,12 @@ A membership was renewed
<li>
<details>
<summary>
-<code>MembershipRequested()</code> - 3</summary>
-An membership was requested
-[idty_id]
+<code>PendingMembershipAdded(member, expire_on)</code> - 2</summary>
+A pending membership was added.
```rust
-: T::IdtyId
+member: T::IdtyId
+expire_on: BlockNumberFor<T>
```
</details>
@@ -1248,25 +1221,11 @@ An membership was requested
<li>
<details>
<summary>
-<code>MembershipRevoked()</code> - 4</summary>
-A membership was revoked
-[idty_id]
+<code>PendingMembershipExpired(member)</code> - 3</summary>
+A pending membership has expired.
```rust
-: T::IdtyId
-```
-
-</details>
-</li>
-<li>
-<details>
-<summary>
-<code>PendingMembershipExpired()</code> - 5</summary>
-A pending membership request has expired
-[idty_id]
-
-```rust
-: T::IdtyId
+member: T::IdtyId
```
</details>
@@ -1279,8 +1238,7 @@ A pending membership request has expired
<details>
<summary>
<code>NewCert(issuer, issuer_issued_count, receiver, receiver_received_count)</code> - 0</summary>
-New certification
-[issuer, issuer_issued_count, receiver, receiver_received_count]
+A new certification was added.
```rust
issuer: T::IdtyIndex
@@ -1295,8 +1253,7 @@ receiver_received_count: u32
<details>
<summary>
<code>RemovedCert(issuer, issuer_issued_count, receiver, receiver_received_count, expiration)</code> - 1</summary>
-Removed certification
-[issuer, issuer_issued_count, receiver, receiver_received_count, expiration]
+A certification was removed.
```rust
issuer: T::IdtyIndex
@@ -1312,8 +1269,7 @@ expiration: bool
<details>
<summary>
<code>RenewedCert(issuer, receiver)</code> - 2</summary>
-Renewed certification
-[issuer, receiver]
+A certification was renewed.
```rust
issuer: T::IdtyIndex
@@ -1326,23 +1282,27 @@ receiver: T::IdtyIndex
</li>
<li>Distance - 44
<ul>
-</ul>
-</li>
-<li>SmithSubWot - 50
-<ul>
-</ul>
+<li>
+<details>
+<summary>
+<code>EvaluationRequested(idty_index, who)</code> - 0</summary>
+A distance evaluation was requested.
+
+```rust
+idty_index: T::IdtyIndex
+who: T::AccountId
+```
+
+</details>
</li>
-<li>SmithMembership - 52
-<ul>
<li>
<details>
<summary>
-<code>MembershipAcquired()</code> - 0</summary>
-A membership was acquired
-[idty_id]
+<code>EvaluationUpdated(evaluator)</code> - 1</summary>
+A distance evaluation was updated.
```rust
-: T::IdtyId
+evaluator: T::AccountId
```
</details>
@@ -1350,25 +1310,33 @@ A membership was acquired
<li>
<details>
<summary>
-<code>MembershipExpired()</code> - 1</summary>
-A membership expired
-[idty_id]
+<code>EvaluationStatusForced(idty_index, status)</code> - 2</summary>
+A distance status was forced.
```rust
-: T::IdtyId
+idty_index: T::IdtyIndex
+status: Option<(<T as frame_system::Config>::AccountId, DistanceStatus)>
```
</details>
</li>
+</ul>
+</li>
+<li>SmithSubWot - 50
+<ul>
+</ul>
+</li>
+<li>SmithMembership - 52
+<ul>
<li>
<details>
<summary>
-<code>MembershipRenewed()</code> - 2</summary>
-A membership was renewed
-[idty_id]
+<code>MembershipAcquired(member, expire_on)</code> - 0</summary>
+A membership was acquired.
```rust
-: T::IdtyId
+member: T::IdtyId
+expire_on: BlockNumberFor<T>
```
</details>
@@ -1376,12 +1344,12 @@ A membership was renewed
<li>
<details>
<summary>
-<code>MembershipRequested()</code> - 3</summary>
-An membership was requested
-[idty_id]
+<code>MembershipTerminated(member, reason)</code> - 1</summary>
+A membership was terminated.
```rust
-: T::IdtyId
+member: T::IdtyId
+reason: MembershipTerminationReason
```
</details>
@@ -1389,12 +1357,12 @@ An membership was requested
<li>
<details>
<summary>
-<code>MembershipRevoked()</code> - 4</summary>
-A membership was revoked
-[idty_id]
+<code>PendingMembershipAdded(member, expire_on)</code> - 2</summary>
+A pending membership was added.
```rust
-: T::IdtyId
+member: T::IdtyId
+expire_on: BlockNumberFor<T>
```
</details>
@@ -1402,12 +1370,11 @@ A membership was revoked
<li>
<details>
<summary>
-<code>PendingMembershipExpired()</code> - 5</summary>
-A pending membership request has expired
-[idty_id]
+<code>PendingMembershipExpired(member)</code> - 3</summary>
+A pending membership has expired.
```rust
-: T::IdtyId
+member: T::IdtyId
```
</details>
@@ -1420,8 +1387,7 @@ A pending membership request has expired
<details>
<summary>
<code>NewCert(issuer, issuer_issued_count, receiver, receiver_received_count)</code> - 0</summary>
-New certification
-[issuer, issuer_issued_count, receiver, receiver_received_count]
+A new certification was added.
```rust
issuer: T::IdtyIndex
@@ -1436,8 +1402,7 @@ receiver_received_count: u32
<details>
<summary>
<code>RemovedCert(issuer, issuer_issued_count, receiver, receiver_received_count, expiration)</code> - 1</summary>
-Removed certification
-[issuer, issuer_issued_count, receiver, receiver_received_count, expiration]
+A certification was removed.
```rust
issuer: T::IdtyIndex
@@ -1453,8 +1418,7 @@ expiration: bool
<details>
<summary>
<code>RenewedCert(issuer, receiver)</code> - 2</summary>
-Renewed certification
-[issuer, receiver]
+A certification was renewed.
```rust
issuer: T::IdtyIndex
@@ -1580,7 +1544,7 @@ call_hash: CallHash
<details>
<summary>
<code>FilledRandomness(request_id, randomness)</code> - 0</summary>
-Filled randomness
+A request for randomness was fulfilled.
```rust
request_id: RequestId
@@ -1593,7 +1557,7 @@ randomness: H256
<details>
<summary>
<code>RequestedRandomness(request_id, salt, r#type)</code> - 1</summary>
-Requested randomness
+A request for randomness was made.
```rust
request_id: RequestId
diff --git a/docs/dev/pallet_conventions.md b/docs/dev/pallet_conventions.md
new file mode 100644
index 000000000..d7b9d7829
--- /dev/null
+++ b/docs/dev/pallet_conventions.md
@@ -0,0 +1,35 @@
+# Duniter Pallet Conventions
+
+## Call
+
+Custom Duniter pallet calls should adhere to the standard Substrate naming convention:
+
+- `action_` for regular calls (e.g., `create_identity`).
+- `force_action_` for calls with a privileged origin (e.g., `force_remove_identity`).
+
+## Error
+
+In the event of a call failure, it should trigger a pallet error with a self-explanatory name, for instance, `IdtyNotFound`.
+
+## Event
+
+Successful calls should deposit a system event to notify external entities of the change. The event name should be self-explanatory and structured in the form of a Rust struct with named fields, ensuring clarity in autogenerated documentation. An example is:
+
+```rust
+IdtyRemoved {
+ idty_index: T::IdtyIndex,
+ reason: IdtyRemovalReason<T::IdtyRemovalOtherReason>,
+}
+```
+
+## Hook
+
+Hooks are inherently infallible, and no errors should be emitted within them. To monitor progression from inside the hook, events can be employed to inform external entities about changes or no-changes.
+
+## Internal Function
+
+Internal functions should adhere to the following naming convention:
+
+- `do_action_` for regular functions executing the base logic of a call (e.g., `do_remove_identity_`). These functions should directly emit events and trigger errors as needed.
+- `force_action_` for privileged functions that bypass any checks. This can be useful for specific benchmarking functions.
+- `check_` for functions performing checks and triggering errors in case of failure.
diff --git a/pallets/authority-members/src/benchmarking.rs b/pallets/authority-members/src/benchmarking.rs
index c0dcc62b8..18e6472f8 100644
--- a/pallets/authority-members/src/benchmarking.rs
+++ b/pallets/authority-members/src/benchmarking.rs
@@ -38,7 +38,7 @@ benchmarks! {
let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
}: _<T::RuntimeOrigin>(caller_origin)
verify {
- assert_has_event::<T>(Event::<T>::MemberGoOffline(id).into());
+ assert_has_event::<T>(Event::<T>::MemberGoOffline{member: id}.into());
}
go_online {
let id: T::MemberId = OnlineAuthorities::<T>::get()[0];
@@ -52,7 +52,7 @@ benchmarks! {
});
}: _<T::RuntimeOrigin>(caller_origin)
verify {
- assert_has_event::<T>(Event::<T>::MemberGoOnline(id).into());
+ assert_has_event::<T>(Event::<T>::MemberGoOnline{member: id}.into());
}
set_session_keys {
let id: T::MemberId = OnlineAuthorities::<T>::get()[0];
@@ -66,16 +66,16 @@ benchmarks! {
let caller_origin = RawOrigin::Root.into();
}: _<T::RuntimeOrigin>(caller_origin, id.clone())
verify {
- assert_has_event::<T>(Event::<T>::MemberRemoved(id).into());
+ assert_has_event::<T>(Event::<T>::MemberRemoved{member: id}.into());
}
remove_member_from_blacklist {
let id: T::MemberId = OnlineAuthorities::<T>::get()[0];
- BlackList::<T>::mutate(|blacklist| {
+ Blacklist::<T>::mutate(|blacklist| {
blacklist.push(id);
});
}: _<T::RuntimeOrigin>(RawOrigin::Root.into(), id)
verify {
- assert_has_event::<T>(Event::<T>::MemberRemovedFromBlackList(id).into());
+ assert_has_event::<T>(Event::<T>::MemberRemovedFromBlacklist{member: id}.into());
}
impl_benchmark_test_suite!(
diff --git a/pallets/authority-members/src/impls.rs b/pallets/authority-members/src/impls.rs
index 80f9eef04..4a2a53304 100644
--- a/pallets/authority-members/src/impls.rs
+++ b/pallets/authority-members/src/impls.rs
@@ -52,9 +52,9 @@ where
};
match strategy {
- SlashStrategy::BlackList => {
+ SlashStrategy::Blacklist => {
for offender in offenders {
- BlackList::<T>::mutate(|blacklist| {
+ Blacklist::<T>::mutate(|blacklist| {
if let Some(member_id) = T::MemberIdOf::convert(offender.offender.0.clone())
{
if !blacklist.contains(&member_id) {
diff --git a/pallets/authority-members/src/lib.rs b/pallets/authority-members/src/lib.rs
index 76b5b6068..3dbe5e113 100644
--- a/pallets/authority-members/src/lib.rs
+++ b/pallets/authority-members/src/lib.rs
@@ -158,7 +158,7 @@ pub mod pallet {
// Blacklist.
#[pallet::storage]
#[pallet::getter(fn blacklist)]
- pub type BlackList<T: Config> = StorageValue<_, Vec<T::MemberId>, ValueQuery>;
+ pub type Blacklist<T: Config> = StorageValue<_, Vec<T::MemberId>, ValueQuery>;
// HOOKS //
@@ -167,54 +167,45 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
- /// List of members who will enter the set of authorities at the next session.
- /// [Vec<member_id>]
- IncomingAuthorities(Vec<T::MemberId>),
- /// List of members who will leave the set of authorities at the next session.
- /// [Vec<member_id>]
- OutgoingAuthorities(Vec<T::MemberId>),
+ /// List of members scheduled to join the set of authorities in the next session.
+ IncomingAuthorities { members: Vec<T::MemberId> },
+ /// List of members leaving the set of authorities in the next session.
+ OutgoingAuthorities { members: Vec<T::MemberId> },
/// A member will leave the set of authorities in 2 sessions.
- /// [member_id]
- MemberGoOffline(T::MemberId),
- /// A member will enter the set of authorities in 2 sessions.
- /// [member_id]
- MemberGoOnline(T::MemberId),
- /// A member has lost the right to be part of the authorities,
- /// this member will be removed from the authority set in 2 sessions.
- /// [member_id]
- MemberRemoved(T::MemberId),
+ MemberGoOffline { member: T::MemberId },
+ /// A member will join the set of authorities in 2 sessions.
+ MemberGoOnline { member: T::MemberId },
+ /// A member, who no longer has authority rights, will be removed from the authority set in 2 sessions.
+ MemberRemoved { member: T::MemberId },
/// A member has been removed from the blacklist.
- /// [member_id]
- MemberRemovedFromBlackList(T::MemberId),
+ MemberRemovedFromBlacklist { member: T::MemberId },
}
// ERRORS //
#[pallet::error]
pub enum Error<T> {
- /// Already incoming
+ /// Member already incoming
AlreadyIncoming,
- /// Already online
+ /// Member already online
AlreadyOnline,
- /// Already outgoing
+ /// Member already outgoing
AlreadyOutgoing,
- /// Not found owner key
+ /// Owner key is invalid as a member.
MemberIdNotFound,
/// Member is blacklisted
- MemberIdBlackListed,
+ MemberBlacklisted,
/// Member is not blacklisted
- MemberNotBlackListed,
+ MemberNotBlacklisted,
/// Member not found
MemberNotFound,
/// Neither online nor scheduled
NotOnlineNorIncoming,
- /// Not owner
- NotOwner,
/// Not member
NotMember,
/// Session keys not provided
SessionKeysNotProvided,
- /// Too man aAuthorities
+ /// Too many authorities.
TooManyAuthorities,
}
@@ -259,7 +250,7 @@ pub mod pallet {
let member_id = Self::verify_ownership_and_membership(&who)?;
if Self::is_blacklisted(member_id) {
- return Err(Error::<T>::MemberIdBlackListed.into());
+ return Err(Error::<T>::MemberBlacklisted.into());
}
if !Members::<T>::contains_key(member_id) {
return Err(Error::<T>::MemberNotFound.into());
@@ -317,7 +308,7 @@ pub mod pallet {
) -> DispatchResultWithPostInfo {
T::RemoveMemberOrigin::ensure_origin(origin)?;
- let member_data = Members::<T>::get(member_id).ok_or(Error::<T>::NotMember)?;
+ let member_data = Members::<T>::get(member_id).ok_or(Error::<T>::MemberNotFound)?;
Self::do_remove_member(member_id, member_data.owner_key);
Ok(().into())
@@ -330,13 +321,13 @@ pub mod pallet {
member_id: T::MemberId,
) -> DispatchResultWithPostInfo {
T::RemoveMemberOrigin::ensure_origin(origin)?;
- BlackList::<T>::mutate(|members_ids| {
+ Blacklist::<T>::mutate(|members_ids| {
if let Ok(index) = members_ids.binary_search(&member_id) {
members_ids.remove(index);
- Self::deposit_event(Event::MemberRemovedFromBlackList(member_id));
+ Self::deposit_event(Event::MemberRemovedFromBlacklist { member: member_id });
Ok(().into())
} else {
- Err(Error::<T>::MemberNotBlackListed.into())
+ Err(Error::<T>::MemberNotBlacklisted.into())
}
})
}
@@ -367,7 +358,7 @@ pub mod pallet {
})?;
let validator_id = T::ValidatorIdOf::convert(old_owner_key.clone())
- .ok_or(Error::<T>::MemberNotFound)?;
+ .ok_or(pallet_session::Error::<T>::NoAssociatedValidatorId)?;
let session_keys = pallet_session::NextKeys::<T>::get(validator_id)
.ok_or(Error::<T>::SessionKeysNotProvided)?;
@@ -413,7 +404,7 @@ pub mod pallet {
}
// Emit event
- Self::deposit_event(Event::MemberRemoved(member_id));
+ Self::deposit_event(Event::MemberRemoved { member: member_id });
let _ = T::OnRemovedMember::on_removed_member(member_id);
}
/// perform incoming authorities insertion
@@ -428,7 +419,7 @@ pub mod pallet {
});
if not_already_inserted {
AuthoritiesCounter::<T>::mutate(|counter| *counter += 1);
- Self::deposit_event(Event::MemberGoOnline(member_id));
+ Self::deposit_event(Event::MemberGoOnline { member: member_id });
}
not_already_inserted
}
@@ -448,7 +439,7 @@ pub mod pallet {
*counter -= 1
}
});
- Self::deposit_event(Event::MemberGoOffline(member_id));
+ Self::deposit_event(Event::MemberGoOffline { member: member_id });
}
not_already_inserted
}
@@ -472,7 +463,7 @@ pub mod pallet {
}
/// check if member is blacklisted
fn is_blacklisted(member_id: T::MemberId) -> bool {
- BlackList::<T>::get().contains(&member_id)
+ Blacklist::<T>::get().contains(&member_id)
}
/// perform removal from incoming authorities
fn remove_in(member_id: T::MemberId) {
@@ -539,10 +530,14 @@ impl<T: Config> pallet_session::SessionManager<T::ValidatorId> for Pallet<T> {
// when no change to the set of autorities, return None
return None;
} else {
- Self::deposit_event(Event::OutgoingAuthorities(members_ids_to_del.clone()));
+ Self::deposit_event(Event::OutgoingAuthorities {
+ members: members_ids_to_del.clone(),
+ });
}
} else {
- Self::deposit_event(Event::IncomingAuthorities(members_ids_to_add.clone()));
+ Self::deposit_event(Event::IncomingAuthorities {
+ members: members_ids_to_add.clone(),
+ });
}
// updates the list of OnlineAuthorities and returns the list of their key
diff --git a/pallets/authority-members/src/tests.rs b/pallets/authority-members/src/tests.rs
index e85e48a45..b404b96f3 100644
--- a/pallets/authority-members/src/tests.rs
+++ b/pallets/authority-members/src/tests.rs
@@ -325,7 +325,7 @@ fn test_offence_black_list() {
offender: (9, ()),
reporters: vec![],
}],
- pallet_offences::SlashStrategy::BlackList,
+ pallet_offences::SlashStrategy::Blacklist,
);
// Verify state
@@ -359,7 +359,7 @@ fn test_offence_black_list_prevent_from_going_online() {
offender: (9, ()),
reporters: vec![],
}],
- pallet_offences::SlashStrategy::BlackList,
+ pallet_offences::SlashStrategy::Blacklist,
);
// Verify state
@@ -385,7 +385,7 @@ fn test_offence_black_list_prevent_from_going_online() {
));
assert_err!(
AuthorityMembers::go_online(RuntimeOrigin::signed(9)),
- Error::<Test>::MemberIdBlackListed
+ Error::<Test>::MemberBlacklisted
);
// Should not be able to auto remove from blacklist
@@ -401,12 +401,12 @@ fn test_offence_black_list_prevent_from_going_online() {
9
));
assert_eq!(AuthorityMembers::blacklist(), EMPTY);
- System::assert_last_event(Event::MemberRemovedFromBlackList(9).into());
+ System::assert_last_event(Event::MemberRemovedFromBlacklist { member: 9 }.into());
// Authorized should not be able to remove a non-existing member from blacklist
assert_err!(
AuthorityMembers::remove_member_from_blacklist(RawOrigin::Root.into(), 9),
- Error::<Test>::MemberNotBlackListed
+ Error::<Test>::MemberNotBlacklisted
);
});
}
diff --git a/pallets/certification/src/benchmarking.rs b/pallets/certification/src/benchmarking.rs
index 5539c7981..f265a95f7 100644
--- a/pallets/certification/src/benchmarking.rs
+++ b/pallets/certification/src/benchmarking.rs
@@ -60,7 +60,7 @@ benchmarks_instance_pallet! {
frame_system::pallet::Pallet::<T>::set_block_number(T::CertPeriod::get());
}: _<T::RuntimeOrigin>(caller_origin, issuer, receiver)
verify {
- assert_has_event::<T, I>(Event::<T, I>::NewCert{ issuer: issuer, issuer_issued_count: issuer_cert + 1, receiver: receiver, receiver_received_count: receiver_cert + 1 }.into());
+ assert_has_event::<T, I>(Event::<T, I>::CertAdded{ issuer: issuer, receiver: receiver }.into());
}
del_cert {
let issuer: T::IdtyIndex = 1.into();
@@ -70,7 +70,7 @@ benchmarks_instance_pallet! {
let issuer_cert: u32 = StorageIdtyCertMeta::<T, I>::get(issuer).issued_count;
}: _<T::RuntimeOrigin>(RawOrigin::Root.into(), issuer, receiver)
verify {
- assert_has_event::<T, I>(Event::<T, I>::RemovedCert{ issuer: issuer, issuer_issued_count: issuer_cert - 1, receiver: receiver, receiver_received_count: receiver_cert - 1, expiration: false }.into());
+ assert_has_event::<T, I>(Event::<T, I>::CertRemoved{ issuer: issuer, receiver: receiver, expiration: false }.into());
}
remove_all_certs_received_by {
let receiver: T::IdtyIndex = 0.into();
@@ -94,7 +94,7 @@ benchmarks_instance_pallet! {
frame_system::pallet::Pallet::<T>::set_block_number(block_number);
}: {Pallet::<T, I>::do_remove_cert(issuer, receiver, Some(block_number));}
verify {
- assert_has_event::<T, I>(Event::<T, I>::RemovedCert{ issuer: issuer, issuer_issued_count: issuer_cert - 1, receiver: receiver, receiver_received_count: receiver_cert - 1, expiration: true }.into());
+ assert_has_event::<T, I>(Event::<T, I>::CertRemoved{ issuer: issuer, receiver: receiver, expiration: true }.into());
}
impl_benchmark_test_suite!(
diff --git a/pallets/certification/src/lib.rs b/pallets/certification/src/lib.rs
index 77af87888..6074908e2 100644
--- a/pallets/certification/src/lib.rs
+++ b/pallets/certification/src/lib.rs
@@ -224,26 +224,19 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config<I>, I: 'static = ()> {
- /// New certification
- /// [issuer, issuer_issued_count, receiver, receiver_received_count]
- NewCert {
+ /// A new certification was added.
+ CertAdded {
issuer: T::IdtyIndex,
- issuer_issued_count: u32,
receiver: T::IdtyIndex,
- receiver_received_count: u32,
},
- /// Removed certification
- /// [issuer, issuer_issued_count, receiver, receiver_received_count, expiration]
- RemovedCert {
+ /// A certification was removed.
+ CertRemoved {
issuer: T::IdtyIndex,
- issuer_issued_count: u32,
receiver: T::IdtyIndex,
- receiver_received_count: u32,
expiration: bool,
},
- /// Renewed certification
- /// [issuer, receiver]
- RenewedCert {
+ /// A certification was renewed.
+ CertRenewed {
issuer: T::IdtyIndex,
receiver: T::IdtyIndex,
},
@@ -253,15 +246,15 @@ pub mod pallet {
#[pallet::error]
pub enum Error<T, I = ()> {
- /// An identity cannot certify itself
+ /// Identity cannot certify itself
CannotCertifySelf,
- /// This identity has already issued the maximum number of certifications
+ /// Identity has already issued the maximum number of certifications
IssuedTooManyCert,
/// Issuer not found
IssuerNotFound,
- /// Not enough certifications received
+ /// Insufficient certifications received.
NotEnoughCertReceived,
- /// This identity has already issued a certification too recently
+ /// Identity has issued a certification too recently.
NotRespectCertPeriod,
}
@@ -437,13 +430,8 @@ pub mod pallet {
cert_meta.received_count
});
- // emit NewCert event
- Self::deposit_event(Event::NewCert {
- issuer,
- issuer_issued_count,
- receiver,
- receiver_received_count,
- });
+ // emit CertAdded event
+ Self::deposit_event(Event::CertAdded { issuer, receiver });
T::OnNewcert::on_new_cert(
issuer,
issuer_issued_count,
@@ -455,8 +443,8 @@ pub mod pallet {
StorageIdtyCertMeta::<T, I>::mutate(issuer, |issuer_idty_cert_meta| {
issuer_idty_cert_meta.next_issuable_on = block_number + T::CertPeriod::get();
});
- // emit RenewedCert event
- Self::deposit_event(Event::RenewedCert { issuer, receiver });
+ // emit CertRenewed event
+ Self::deposit_event(Event::CertRenewed { issuer, receiver });
}
Ok(().into())
@@ -516,11 +504,9 @@ pub mod pallet {
cert_meta.received_count = cert_meta.received_count.saturating_sub(1);
cert_meta.received_count
});
- Self::deposit_event(Event::RemovedCert {
+ Self::deposit_event(Event::CertRemoved {
issuer,
- issuer_issued_count,
receiver,
- receiver_received_count,
expiration: block_number_opt.is_some(),
});
// Should always return Weight::zero
diff --git a/pallets/certification/src/tests.rs b/pallets/certification/src/tests.rs
index 856788409..cf09fa72d 100644
--- a/pallets/certification/src/tests.rs
+++ b/pallets/certification/src/tests.rs
@@ -113,11 +113,9 @@ fn test_genesis_build() {
// Cert 2->1 must have expired
assert_eq!(
System::events()[0].event,
- RuntimeEvent::DefaultCertification(Event::RemovedCert {
+ RuntimeEvent::DefaultCertification(Event::CertRemoved {
issuer: 2,
- issuer_issued_count: 1,
receiver: 1,
- receiver_received_count: 1,
expiration: true,
},)
);
@@ -199,19 +197,15 @@ fn test_cert_expiry() {
.execute_with(|| {
run_to_block(5);
// Expiry of cert by issuer 1
- System::assert_has_event(RuntimeEvent::DefaultCertification(Event::RemovedCert {
+ System::assert_has_event(RuntimeEvent::DefaultCertification(Event::CertRemoved {
issuer: 1,
- issuer_issued_count: 1,
receiver: 0,
- receiver_received_count: 1,
expiration: true,
}));
// Expiry of cert by issuer 2
- System::assert_has_event(RuntimeEvent::DefaultCertification(Event::RemovedCert {
+ System::assert_has_event(RuntimeEvent::DefaultCertification(Event::CertRemoved {
receiver: 0,
issuer: 2,
- issuer_issued_count: 1,
- receiver_received_count: 0, // <-- No more cert received
expiration: true,
}));
});
@@ -245,18 +239,16 @@ fn test_cert_renewal() {
DefaultCertification::add_cert(RuntimeOrigin::signed(1), 1, 0),
Ok(().into())
);
- System::assert_last_event(RuntimeEvent::DefaultCertification(Event::RenewedCert {
+ System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRenewed {
issuer: 1,
receiver: 0,
}));
run_to_block(12);
// expiry of previously renewed cert
- System::assert_last_event(RuntimeEvent::DefaultCertification(Event::RemovedCert {
+ System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRemoved {
issuer: 1,
- issuer_issued_count: 1,
receiver: 0,
- receiver_received_count: 1,
expiration: true,
}));
});
@@ -289,7 +281,7 @@ fn test_cert_renewal_cert_delay() {
DefaultCertification::add_cert(RuntimeOrigin::signed(1), 1, 0),
Ok(().into())
);
- System::assert_last_event(RuntimeEvent::DefaultCertification(Event::RenewedCert {
+ System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRenewed {
issuer: 1,
receiver: 0,
}));
@@ -333,7 +325,7 @@ fn test_cert_renewal_expiration() {
DefaultCertification::add_cert(RuntimeOrigin::signed(1), 1, 0),
Ok(().into())
);
- System::assert_last_event(RuntimeEvent::DefaultCertification(Event::RenewedCert {
+ System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRenewed {
issuer: 1,
receiver: 0,
}));
@@ -345,7 +337,7 @@ fn test_cert_renewal_expiration() {
DefaultCertification::add_cert(RuntimeOrigin::signed(1), 1, 0),
Ok(().into())
);
- System::assert_last_event(RuntimeEvent::DefaultCertification(Event::RenewedCert {
+ System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRenewed {
issuer: 1,
receiver: 0,
}));
@@ -357,11 +349,9 @@ fn test_cert_renewal_expiration() {
run_to_block(14);
// expiry of previously renewed cert
- System::assert_last_event(RuntimeEvent::DefaultCertification(Event::RemovedCert {
+ System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRemoved {
issuer: 1,
- issuer_issued_count: 1,
receiver: 0,
- receiver_received_count: 1,
expiration: true,
}));
});
diff --git a/pallets/distance/src/benchmarking.rs b/pallets/distance/src/benchmarking.rs
index eb181d4c0..9fbbd3242 100644
--- a/pallets/distance/src/benchmarking.rs
+++ b/pallets/distance/src/benchmarking.rs
@@ -28,6 +28,10 @@ use sp_runtime::Perbill;
use crate::Pallet;
+fn assert_has_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
+ frame_system::Pallet::<T>::assert_has_event(generic_event.into());
+}
+
fn populate_pool<T: Config>(i: u32) -> Result<(), &'static str> {
EvaluationPool0::<T>::mutate(|current_pool| -> Result<(), &'static str> {
for j in 0..i {
@@ -53,7 +57,8 @@ benchmarks! {
let _ = <Balances<T> as Currency<_>>::make_free_balance_be(&caller, T::Balance::max_value());
}: _<T::RuntimeOrigin>(caller_origin.clone())
verify {
- assert!(IdentityDistanceStatus::<T>::get(&idty) == Some((caller, DistanceStatus::Pending)), "Request not added");
+ assert!(IdentityDistanceStatus::<T>::get(&idty) == Some((caller.clone(), DistanceStatus::Pending)), "Request not added");
+ assert_has_event::<T>(Event::<T>::EvaluationRequested { idty_index: idty, who: caller }.into());
}
update_evaluation {
let digest_data = sp_consensus_babe::digests::PreDigest::SecondaryPlain(
@@ -66,19 +71,26 @@ benchmarks! {
let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
let i in 1 .. MAX_EVALUATIONS_PER_SESSION => populate_pool::<T>(i)?;
}: _<T::RuntimeOrigin>(RawOrigin::None.into(), ComputationResult{distances: vec![Perbill::one(); i as usize]})
+ verify {
+ assert_has_event::<T>(Event::<T>::EvaluationUpdated { evaluator: caller }.into());
+ }
force_update_evaluation {
let idty = T::IdtyIndex::one();
let caller: T::AccountId = pallet_identity::Identities::<T>::get(idty).unwrap().owner_key;
let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
let i in 1 .. MAX_EVALUATIONS_PER_SESSION => populate_pool::<T>(i)?;
- }: _<T::RuntimeOrigin>(RawOrigin::Root.into(), caller, ComputationResult{distances: vec![Perbill::one(); i as usize]})
+ }: _<T::RuntimeOrigin>(RawOrigin::Root.into(), caller.clone(), ComputationResult{distances: vec![Perbill::one(); i as usize]})
+ verify {
+ assert_has_event::<T>(Event::<T>::EvaluationUpdated { evaluator: caller }.into());
+ }
force_set_distance_status {
let idty = T::IdtyIndex::one();
let caller: T::AccountId = pallet_identity::Identities::<T>::get(idty).unwrap().owner_key;
let status = Some((caller.clone(), DistanceStatus::Valid));
- }: _<T::RuntimeOrigin>(RawOrigin::Root.into(), idty, status)
+ }: _<T::RuntimeOrigin>(RawOrigin::Root.into(), idty, status.clone())
verify {
assert!(IdentityDistanceStatus::<T>::get(&idty) == Some((caller, DistanceStatus::Valid)), "Status not set");
+ assert_has_event::<T>(Event::<T>::EvaluationStatusForced { idty_index: idty, status }.into());
}
on_finalize {
DidUpdate::<T>::set(true);
diff --git a/pallets/distance/src/lib.rs b/pallets/distance/src/lib.rs
index d467368e6..62a33b4fa 100644
--- a/pallets/distance/src/lib.rs
+++ b/pallets/distance/src/lib.rs
@@ -77,7 +77,9 @@ pub mod pallet {
type MinAccessibleReferees: Get<Perbill>;
/// Number of session to keep a positive evaluation result
type ResultExpiration: Get<u32>;
- // /// Type representing the weight of this pallet
+ /// The overarching event type.
+ type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+ /// Type representing the weight of this pallet
type WeightInfo: WeightInfo;
}
@@ -160,20 +162,44 @@ pub mod pallet {
// storage_id + 1 => receives results
// storage_id + 2 => receives new identities
// (this avoids problems for session_index < 3)
+ //
+
+ #[pallet::event]
+ #[pallet::generate_deposit(pub(super) fn deposit_event)]
+ pub enum Event<T: Config> {
+ /// A distance evaluation was requested.
+ EvaluationRequested {
+ idty_index: T::IdtyIndex,
+ who: T::AccountId,
+ },
+ /// A distance evaluation was updated.
+ EvaluationUpdated { evaluator: T::AccountId },
+ /// A distance status was forced.
+ EvaluationStatusForced {
+ idty_index: T::IdtyIndex,
+ status: Option<(<T as frame_system::Config>::AccountId, DistanceStatus)>,
+ },
+ }
// ERRORS //
#[pallet::error]
pub enum Error<T> {
+ /// Distance is already under evaluation.
AlreadyInEvaluation,
- CannotReserve,
- ManyEvaluationsByAuthor,
- ManyEvaluationsInBlock,
+ /// Too many evaluations requested by author.
+ TooManyEvaluationsByAuthor,
+ /// Too many evaluations for this block.
+ TooManyEvaluationsInBlock,
+ /// No author for this block.
NoAuthor,
+ /// Caller has no identity.
NoIdentity,
- NonEligibleForEvaluation,
+ /// Evaluation queue is full.
QueueFull,
+ /// Too many evaluators in the current evaluation pool.
TooManyEvaluators,
+ /// Evaluation result has a wrong length.
WrongResultLength,
}
@@ -208,7 +234,8 @@ pub mod pallet {
pallet_identity::IdentityIndexOf::<T>::get(&who).ok_or(Error::<T>::NoIdentity)?;
ensure!(
- IdentityDistanceStatus::<T>::get(idty).is_none(),
+ IdentityDistanceStatus::<T>::get(idty)
+ != Some((who.clone(), DistanceStatus::Pending)),
Error::<T>::AlreadyInEvaluation
);
@@ -226,7 +253,7 @@ pub mod pallet {
ensure_none(origin)?;
ensure!(
!DidUpdate::<T>::exists(),
- Error::<T>::ManyEvaluationsInBlock,
+ Error::<T>::TooManyEvaluationsInBlock,
);
let author = pallet_authorship::Pallet::<T>::author().ok_or(Error::<T>::NoAuthor)?;
@@ -265,15 +292,20 @@ pub mod pallet {
) -> DispatchResult {
ensure_root(origin)?;
- IdentityDistanceStatus::<T>::set(identity, status);
+ IdentityDistanceStatus::<T>::set(identity, status.clone());
DistanceStatusExpireOn::<T>::mutate(
pallet_session::CurrentIndex::<T>::get() + T::ResultExpiration::get(),
move |identities| {
identities
.try_push(identity)
- .map_err(|_| Error::<T>::ManyEvaluationsInBlock.into())
+ .map_err(|_| Error::<T>::TooManyEvaluationsInBlock)
},
- )
+ )?;
+ Self::deposit_event(Event::EvaluationStatusForced {
+ idty_index: identity,
+ status,
+ });
+ Ok(())
}
}
@@ -292,7 +324,7 @@ pub mod pallet {
move |identities| {
identities
.try_push(identity)
- .map_err(|_| Error::<T>::ManyEvaluationsInBlock.into())
+ .map_err(|_| Error::<T>::TooManyEvaluationsInBlock.into())
},
)
}
@@ -381,13 +413,16 @@ pub mod pallet {
.try_push((idty_index, median::MedianAcc::new()))
.map_err(|_| Error::<T>::QueueFull)?;
- IdentityDistanceStatus::<T>::insert(idty_index, (who, DistanceStatus::Pending));
+ IdentityDistanceStatus::<T>::insert(
+ idty_index,
+ (&who, DistanceStatus::Pending),
+ );
DistanceStatusExpireOn::<T>::mutate(
pallet_session::CurrentIndex::<T>::get() + T::ResultExpiration::get(),
move |identities| identities.try_push(idty_index).ok(),
);
-
+ Self::deposit_event(Event::EvaluationRequested { idty_index, who });
Ok(())
},
)
@@ -405,7 +440,7 @@ pub mod pallet {
if result_pool
.evaluators
- .try_insert(evaluator)
+ .try_insert(evaluator.clone())
.map_err(|_| Error::<T>::TooManyEvaluators)?
{
for (distance_value, (_identity, median_acc)) in computation_result
@@ -416,9 +451,10 @@ pub mod pallet {
median_acc.push(distance_value);
}
+ Self::deposit_event(Event::EvaluationUpdated { evaluator });
Ok(())
} else {
- Err(Error::<T>::ManyEvaluationsByAuthor.into())
+ Err(Error::<T>::TooManyEvaluationsByAuthor.into())
}
})
}
@@ -444,24 +480,23 @@ pub mod pallet {
MedianResult::One(m) => m,
MedianResult::Two(m1, m2) => m1 + (m2 - m1) / 2, // Avoid overflow (since max is 1)
};
- if median >= T::MinAccessibleReferees::get() {
- IdentityDistanceStatus::<T>::mutate(idty, |entry| {
- entry.as_mut().map(|(account_id, status)| {
+ IdentityDistanceStatus::<T>::mutate(idty, |entry| {
+ if let Some((account_id, status)) = entry.as_mut() {
+ if median >= T::MinAccessibleReferees::get() {
T::Currency::unreserve(
account_id,
<T as Config>::EvaluationPrice::get(),
);
*status = DistanceStatus::Valid;
- })
- });
- } else if let Some((account_id, _status)) =
- IdentityDistanceStatus::<T>::take(idty)
- {
- <T as Config>::Currency::slash_reserved(
- &account_id,
- <T as Config>::EvaluationPrice::get(),
- );
- }
+ } else {
+ T::Currency::slash_reserved(
+ account_id,
+ <T as Config>::EvaluationPrice::get(),
+ );
+ *status = DistanceStatus::Invalid;
+ }
+ }
+ });
} else if let Some((account_id, _status)) = IdentityDistanceStatus::<T>::take(idty)
{
<T as Config>::Currency::unreserve(
diff --git a/pallets/distance/src/mock.rs b/pallets/distance/src/mock.rs
index 5d580b137..17071e729 100644
--- a/pallets/distance/src/mock.rs
+++ b/pallets/distance/src/mock.rs
@@ -63,7 +63,7 @@ frame_support::construct_runtime!(
AuthorityMembers: pallet_authority_members::{Pallet, Call, Storage, Config<T>, Event<T>},
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
Identity: pallet_identity::{Pallet, Call, Storage, Config<T>, Event<T>},
- Distance: pallet_distance::{Pallet, Call, Storage},
+ Distance: pallet_distance::{Pallet, Call, Storage, Event<T>},
}
);
@@ -255,6 +255,7 @@ impl pallet_distance::Config for Test {
type EvaluationPrice = frame_support::traits::ConstU64<1000>;
type MinAccessibleReferees = MinAccessibleReferees;
type ResultExpiration = frame_support::traits::ConstU32<720>;
+ type RuntimeEvent = RuntimeEvent;
type WeightInfo = ();
}
diff --git a/pallets/distance/src/types.rs b/pallets/distance/src/types.rs
index 8a3613344..95ab967e2 100644
--- a/pallets/distance/src/types.rs
+++ b/pallets/distance/src/types.rs
@@ -28,6 +28,8 @@ pub enum DistanceStatus {
Pending,
/// Identity respects the distance
Valid,
+ /// Identity doesn't respect the distance
+ Invalid,
}
/// Pool where distance evaluation requests and results are stored
diff --git a/pallets/duniter-account/src/lib.rs b/pallets/duniter-account/src/lib.rs
index d7c5127bc..93964997e 100644
--- a/pallets/duniter-account/src/lib.rs
+++ b/pallets/duniter-account/src/lib.rs
@@ -176,22 +176,19 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
- /// Force the destruction of an account because its free balance is insufficient to pay
- /// the account creation price.
- /// [who, balance]
+ /// Forced destruction of an account due to insufficient free balance to cover the account creation price.
ForceDestroy {
who: T::AccountId,
balance: T::Balance,
},
- /// Random id assigned
- /// [account_id, random_id]
+ /// A random ID has been assigned to the account.
RandomIdAssigned { who: T::AccountId, random_id: H256 },
/// account linked to identity
AccountLinked {
who: T::AccountId,
identity: IdtyIdOf<T>,
},
- /// account unlinked from identity
+ /// The account was unlinked from its identity.
AccountUnlinked(T::AccountId),
}
diff --git a/pallets/duniter-wot/src/lib.rs b/pallets/duniter-wot/src/lib.rs
index bdede1716..7f017280c 100644
--- a/pallets/duniter-wot/src/lib.rs
+++ b/pallets/duniter-wot/src/lib.rs
@@ -107,29 +107,31 @@ pub mod pallet {
#[pallet::error]
pub enum Error<T, I = ()> {
- /// Not enough certifications received to claim membership
+ /// Insufficient certifications received to claim membership.
NotEnoughCertsToClaimMembership,
- /// Distance has not been evaluated positively
- DistanceNotOK,
- /// Identity not allowed to request membership
+ /// Distance is invalid.
+ DistanceIsInvalid,
+ /// Distance is not evaluated.
+ DistanceNotEvaluated,
+ /// Identity is not allowed to request membership.
IdtyNotAllowedToRequestMembership,
- /// Identity not allowed to renew membership
+ /// Identity not allowed to renew membership.
IdtyNotAllowedToRenewMembership,
- /// Identity creation period not respected
+ /// Identity creation period not respected.
IdtyCreationPeriodNotRespected,
- /// Not enough received certifications to create identity
+ /// Insufficient received certifications to create identity.
NotEnoughReceivedCertsToCreateIdty,
- /// Max number of emitted certs reached
+ /// Maximum number of emitted certifications reached.
MaxEmittedCertsReached,
- /// Not allowed to change identity address
+ /// Not allowed to change identity address.
NotAllowedToChangeIdtyAddress,
- /// Not allowed to remove identity
+ /// Not allowed to remove identity.
NotAllowedToRemoveIdty,
- /// Issuer can not emit cert because it is not validated
+ /// Issuer cannot emit a certification because it is not validated.
IssuerCanNotEmitCert,
- /// Can not issue cert to identity without membership or pending membership
+ /// Cannot issue a certification to an identity without membership or pending membership.
CertToUndefined,
- /// Issuer or receiver not found
+ /// Issuer or receiver not found.
IdtyNotFound,
}
}
@@ -296,10 +298,7 @@ impl<T: Config<I>, I: 'static> sp_membership::traits::CheckMembershipCallAllowed
idty_cert_meta.received_count >= T::MinCertForMembership::get(),
Error::<T, I>::NotEnoughCertsToClaimMembership
);
- ensure!(
- T::IsDistanceOk::is_distance_ok(idty_index),
- Error::<T, I>::DistanceNotOK,
- );
+ T::IsDistanceOk::is_distance_ok(idty_index)?;
Ok(())
}
@@ -310,10 +309,7 @@ impl<T: Config<I>, I: 'static> sp_membership::traits::CheckMembershipCallAllowed
idty_value.status == IdtyStatus::Validated,
Error::<T, I>::IdtyNotAllowedToRenewMembership
);
- ensure!(
- T::IsDistanceOk::is_distance_ok(idty_index),
- Error::<T, I>::DistanceNotOK,
- );
+ T::IsDistanceOk::is_distance_ok(idty_index)?;
} else {
return Err(Error::<T, I>::IdtyNotFound.into());
}
@@ -328,25 +324,18 @@ where
{
fn on_event(membership_event: &sp_membership::Event<IdtyIndex>) {
match membership_event {
- sp_membership::Event::<IdtyIndex>::MembershipAcquired(idty_index) => {
+ sp_membership::Event::<IdtyIndex>::MembershipAdded(idty_index) => {
if !T::IsSubWot::get() {
// when membership is acquired, validate identity
// (only used on first membership acquiry)
pallet_identity::Pallet::<T>::try_validate_identity(*idty_index);
}
}
- sp_membership::Event::<IdtyIndex>::MembershipExpired(_) => {}
- // Membership revocation cases:
- // - Triggered by main identity removal: the underlying identity will be removed by the
- // caller.
- // - Triggered by the membership pallet: it's only possible for a sub-wot, so we
- // should not remove the underlying identity
- // So, in any case, we must do nothing
- sp_membership::Event::<IdtyIndex>::MembershipRevoked(_) => {}
+ sp_membership::Event::<IdtyIndex>::MembershipRemoved(_) => {}
sp_membership::Event::<IdtyIndex>::MembershipRenewed(_) => {}
- sp_membership::Event::<IdtyIndex>::MembershipRequested(_) => {}
+ sp_membership::Event::<IdtyIndex>::PendingMembershipAdded(_) => {}
sp_membership::Event::<IdtyIndex>::PendingMembershipExpired(idty_index) => {
- Self::dispatch_idty_call(pallet_identity::Call::remove_identity {
+ Self::dispatch_idty_call(pallet_identity::Call::force_remove_identity {
idty_index: *idty_index,
idty_name: None,
reason: pallet_identity::IdtyRemovalReason::Other(
diff --git a/pallets/duniter-wot/src/tests.rs b/pallets/duniter-wot/src/tests.rs
index 24d0a2c14..71a58f5e4 100644
--- a/pallets/duniter-wot/src/tests.rs
+++ b/pallets/duniter-wot/src/tests.rs
@@ -24,6 +24,7 @@ use pallet_identity::{
IdtyIndexAccountIdPayload, IdtyName, IdtyStatus, RevocationPayload,
NEW_OWNER_KEY_PAYLOAD_PREFIX, REVOCATION_PAYLOAD_PREFIX,
};
+use pallet_membership::MembershipRemovalReason;
use sp_runtime::testing::TestSignature;
/// test that genesis builder creates the good number of identities
@@ -83,7 +84,12 @@ fn test_join_smiths() {
4
),));
System::assert_has_event(RuntimeEvent::SmithMembership(
- pallet_membership::Event::MembershipRequested(4),
+ pallet_membership::Event::PendingMembershipAdded {
+ member: 4,
+ expire_on: 2
+ + <Test as pallet_membership::Config<Instance2>>::PendingMembershipPeriod::get(
+ ),
+ },
));
// Then, Alice should be able to send a smith cert to Dave
@@ -98,7 +104,11 @@ fn test_join_smiths() {
run_to_block(4);
assert_ok!(SmithMembership::claim_membership(RuntimeOrigin::signed(4),));
System::assert_has_event(RuntimeEvent::SmithMembership(
- pallet_membership::Event::MembershipAcquired(4),
+ pallet_membership::Event::MembershipAdded {
+ member: 4,
+ expire_on: 4
+ + <Test as pallet_membership::Config<Instance2>>::MembershipPeriod::get(),
+ },
));
});
}
@@ -110,7 +120,10 @@ fn test_smith_certs_expirations_should_expire_smith_membership() {
// After block #10, alice membership should be revoked due to smith certs expiration
run_to_block(10);
System::assert_has_event(RuntimeEvent::SmithMembership(
- pallet_membership::Event::MembershipExpired(1),
+ pallet_membership::Event::MembershipRemoved {
+ member: 1,
+ reason: MembershipRemovalReason::Expired,
+ },
));
});
}
@@ -172,18 +185,16 @@ fn test_create_idty_ok() {
// Alice should be able to create an identity at block #2
assert_ok!(Identity::create_identity(RuntimeOrigin::signed(1), 6));
- // 2 events should have occurred: IdtyCreated and NewCert
+ // 2 events should have occurred: IdtyCreated and CertAdded
System::assert_has_event(RuntimeEvent::Identity(
pallet_identity::Event::IdtyCreated {
idty_index: 6,
owner_key: 6,
},
));
- System::assert_has_event(RuntimeEvent::Cert(pallet_certification::Event::NewCert {
+ System::assert_has_event(RuntimeEvent::Cert(pallet_certification::Event::CertAdded {
issuer: 1,
- issuer_issued_count: 5,
receiver: 6,
- receiver_received_count: 1,
}));
assert_eq!(Identity::identity(6).unwrap().status, IdtyStatus::Created);
@@ -209,11 +220,9 @@ fn test_new_idty_validation() {
// Bob should be able to certify Ferdie
run_to_block(4);
assert_ok!(Cert::add_cert(RuntimeOrigin::signed(2), 2, 6));
- System::assert_has_event(RuntimeEvent::Cert(pallet_certification::Event::NewCert {
+ System::assert_has_event(RuntimeEvent::Cert(pallet_certification::Event::CertAdded {
issuer: 2,
- issuer_issued_count: 5,
receiver: 6,
- receiver_received_count: 2,
}));
// Ferdie should not be able to claim membership
@@ -226,7 +235,11 @@ fn test_new_idty_validation() {
run_to_block(5);
assert_ok!(Identity::validate_identity(RuntimeOrigin::signed(42), 6));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipAcquired(6),
+ pallet_membership::Event::MembershipAdded {
+ member: 6,
+ expire_on: 5
+ + <Test as pallet_membership::Config<Instance1>>::MembershipPeriod::get(),
+ },
));
System::assert_has_event(RuntimeEvent::Identity(
pallet_identity::Event::IdtyValidated { idty_index: 6 },
@@ -265,7 +278,12 @@ fn test_confirm_idty_ok() {
IdtyName::from("Ferdie"),
));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipRequested(6),
+ pallet_membership::Event::PendingMembershipAdded {
+ member: 6,
+ expire_on: 3
+ + <Test as pallet_membership::Config<Instance1>>::PendingMembershipPeriod::get(
+ ),
+ },
));
System::assert_has_event(RuntimeEvent::Identity(
pallet_identity::Event::IdtyConfirmed {
@@ -349,7 +367,10 @@ fn test_idty_membership_expire() {
assert!(Membership::membership(3).is_none());
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipExpired(3),
+ pallet_membership::Event::MembershipRemoved {
+ member: 3,
+ reason: MembershipRemovalReason::Expired,
+ },
));
// membership expiry should not trigger identity removal
assert!(!System::events().iter().any(|record| record.event
@@ -365,7 +386,7 @@ fn test_idty_membership_expire() {
// then pending membership should expire and identity should finally be removed
run_to_block(11);
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::PendingMembershipExpired(3),
+ pallet_membership::Event::PendingMembershipExpired { member: 3 },
));
System::assert_has_event(RuntimeEvent::Identity(
pallet_identity::Event::IdtyRemoved {
@@ -443,17 +464,18 @@ fn test_certification_expire() {
run_to_block(10);
// println!("{:?}", System::events());
System::assert_has_event(RuntimeEvent::SmithCert(
- pallet_certification::Event::RemovedCert {
- issuer: 2, // Bob
- issuer_issued_count: 1, // Bob → Charlie only
- receiver: 1, // Alice
- receiver_received_count: 1, // Charlie → Alice only
+ pallet_certification::Event::CertRemoved {
+ issuer: 2, // Bob
+ receiver: 1, // Alice
expiration: true,
},
));
// in consequence, since Alice has only 1/2 smith certification remaining, she looses smith membership
System::assert_has_event(RuntimeEvent::SmithMembership(
- pallet_membership::Event::MembershipExpired(1),
+ pallet_membership::Event::MembershipRemoved {
+ member: 1,
+ reason: MembershipRemovalReason::Expired,
+ },
));
// --- BLOCK 14 ---
@@ -466,17 +488,18 @@ fn test_certification_expire() {
run_to_block(20);
// println!("{:?}", System::events());
System::assert_has_event(RuntimeEvent::Cert(
- pallet_certification::Event::RemovedCert {
- issuer: 2, // Bob
- issuer_issued_count: 1, // Bob → Charlie
- receiver: 1, // Alice
- receiver_received_count: 1, // Charlie → Alice
+ pallet_certification::Event::CertRemoved {
+ issuer: 2, // Bob
+ receiver: 1, // Alice
expiration: true,
},
));
// in consequence, since Alice has only 1/2 normal certification remaining, she looses normal membership
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipExpired(1),
+ pallet_membership::Event::MembershipRemoved {
+ member: 1,
+ reason: MembershipRemovalReason::Expired,
+ },
));
// --- BLOCK 21 ---
@@ -502,7 +525,7 @@ fn test_certification_expire() {
// println!("{:?}", System::events());
// after a delay (3 blocks), the pending membership finally expires
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::PendingMembershipExpired(1),
+ pallet_membership::Event::PendingMembershipExpired { member: 1 },
));
// and the identity is removed
System::assert_has_event(RuntimeEvent::Identity(
@@ -555,17 +578,18 @@ fn test_cert_can_not_be_issued() {
run_to_block(10);
// println!("{:?}", System::events());
System::assert_has_event(RuntimeEvent::SmithCert(
- pallet_certification::Event::RemovedCert {
- issuer: 2, // Bob
- issuer_issued_count: 1, // Bob → Charlie only
- receiver: 1, // Alice
- receiver_received_count: 1, // Charlie → Alice only
+ pallet_certification::Event::CertRemoved {
+ issuer: 2, // Bob
+ receiver: 1, // Alice
expiration: true,
},
));
// in consequence, since Alice has only 1/2 smith certification remaining, she looses smith membership
System::assert_has_event(RuntimeEvent::SmithMembership(
- pallet_membership::Event::MembershipExpired(1),
+ pallet_membership::Event::MembershipRemoved {
+ member: 1,
+ reason: MembershipRemovalReason::Expired,
+ },
));
run_to_block(11);
@@ -602,18 +626,19 @@ fn test_cert_can_not_be_issued() {
run_to_block(20);
// println!("{:?}", System::events());
System::assert_has_event(RuntimeEvent::Cert(
- pallet_certification::Event::RemovedCert {
- issuer: 2, // Bob
- issuer_issued_count: 2, // depends of the order of cert expiration
- receiver: 1, // Alice
- receiver_received_count: 2, // depends of the order of cert expiration
+ pallet_certification::Event::CertRemoved {
+ issuer: 2, // Bob
+ receiver: 1, // Alice
expiration: true,
},
));
// other certifications expire, but not Dave → Alice
// in consequence, since Alice has only 1/2 certification remaining, she looses membership
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipExpired(1), // pending membership expires at 23
+ pallet_membership::Event::MembershipRemoved {
+ member: 1,
+ reason: MembershipRemovalReason::Expired,
+ }, // pending membership expires at 23
));
run_to_block(21);
diff --git a/pallets/duniter-wot/src/traits.rs b/pallets/duniter-wot/src/traits.rs
index 7c3d7b220..6934ce454 100644
--- a/pallets/duniter-wot/src/traits.rs
+++ b/pallets/duniter-wot/src/traits.rs
@@ -14,14 +14,16 @@
// You should have received a copy of the GNU Affero General Public License
// along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>.
+use crate::DispatchError;
+
pub trait IsDistanceOk<IdtyId> {
- fn is_distance_ok(idty_id: &IdtyId) -> bool;
+ fn is_distance_ok(idty_id: &IdtyId) -> Result<(), DispatchError>;
}
pub struct DistanceAlwaysOk;
impl<IdtyId> IsDistanceOk<IdtyId> for DistanceAlwaysOk {
- fn is_distance_ok(_idty_id: &IdtyId) -> bool {
- true
+ fn is_distance_ok(_idty_id: &IdtyId) -> Result<(), DispatchError> {
+ Ok(())
}
}
diff --git a/pallets/identity/src/benchmarking.rs b/pallets/identity/src/benchmarking.rs
index 735f40c0e..2ec4a1352 100644
--- a/pallets/identity/src/benchmarking.rs
+++ b/pallets/identity/src/benchmarking.rs
@@ -225,7 +225,7 @@ benchmarks! {
assert!(IdentityIndexOf::<T>::get(&account.key).is_none(), "Identity not revoked");
}
- remove_identity {
+ force_remove_identity {
let new_identity: T::AccountId = account("new_identity", 2, SEED);
let account: Account<T> = create_one_identity(new_identity)?;
let identities = Pallet::<T>::identities_count();
diff --git a/pallets/identity/src/lib.rs b/pallets/identity/src/lib.rs
index 87d929f5c..e60ab74ac 100644
--- a/pallets/identity/src/lib.rs
+++ b/pallets/identity/src/lib.rs
@@ -239,28 +239,24 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
- /// A new identity has been created
- /// [idty_index, owner_key]
+ /// A new identity has been created.
IdtyCreated {
idty_index: T::IdtyIndex,
owner_key: T::AccountId,
},
- /// An identity has been confirmed by its owner
- /// [idty_index, owner_key, name]
+ /// An identity has been confirmed by its owner.
IdtyConfirmed {
idty_index: T::IdtyIndex,
owner_key: T::AccountId,
name: IdtyName,
},
- /// An identity has been validated
- /// [idty_index]
+ /// An identity has been validated.
IdtyValidated { idty_index: T::IdtyIndex },
IdtyChangedOwnerKey {
idty_index: T::IdtyIndex,
new_owner_key: T::AccountId,
},
- /// An identity has been removed
- /// [idty_index]
+ /// An identity has been removed.
IdtyRemoved {
idty_index: T::IdtyIndex,
reason: IdtyRemovalReason<T::IdtyRemovalOtherReason>,
@@ -555,9 +551,9 @@ pub mod pallet {
}
#[pallet::call_index(5)]
- #[pallet::weight(T::WeightInfo::remove_identity())]
+ #[pallet::weight(T::WeightInfo::force_remove_identity())]
/// remove an identity from storage
- pub fn remove_identity(
+ pub fn force_remove_identity(
origin: OriginFor<T>,
idty_index: T::IdtyIndex,
idty_name: Option<IdtyName>,
@@ -646,48 +642,34 @@ pub mod pallet {
#[pallet::error]
pub enum Error<T> {
- /// Identity already confirmed
+ /// Identity already confirmed.
IdtyAlreadyConfirmed,
- /// Identity already created
+ /// Identity already created.
IdtyAlreadyCreated,
- /// Identity already validated
+ /// Identity already validated.
IdtyAlreadyValidated,
- /// You are not allowed to create a new identity now
- IdtyCreationNotAllowed,
- /// Identity index not found
+ /// Identity index not found.
IdtyIndexNotFound,
- /// Identity name already exists
+ /// Identity name already exists.
IdtyNameAlreadyExist,
- /// Invalid identity name
+ /// Invalid identity name.
IdtyNameInvalid,
- /// Identity not confirmed by its owner
+ /// Identity not confirmed by its owner.
IdtyNotConfirmedByOwner,
- /// Identity not found
+ /// Identity not found.
IdtyNotFound,
- /// Identity not member
- IdtyNotMember,
- /// Identity not validated
- IdtyNotValidated,
- /// Identity not yet renewable
- IdtyNotYetRenewable,
- /// payload signature is invalid
+ /// Invalid payload signature.
InvalidSignature,
- /// Revocation key is invalid
+ /// Invalid revocation key.
InvalidRevocationKey,
- /// Identity creation period is not respected
+ /// Identity creation period is not respected.
NotRespectIdtyCreationPeriod,
- /// Not the same identity name
- NotSameIdtyName,
- /// Owner key already recently changed
+ /// Owner key already changed recently.
OwnerKeyAlreadyRecentlyChanged,
- /// Owner key already used
+ /// Owner key already used.
OwnerKeyAlreadyUsed,
- /// Prohibited to revert to an old key
+ /// Reverting to an old key is prohibited.
ProhibitedToRevertToAnOldKey,
- /// Right already added
- RightAlreadyAdded,
- /// Right does not exist
- RightNotExist,
}
// PUBLIC FUNCTIONS //
diff --git a/pallets/identity/src/weights.rs b/pallets/identity/src/weights.rs
index 266b0eb51..729d3a8ef 100644
--- a/pallets/identity/src/weights.rs
+++ b/pallets/identity/src/weights.rs
@@ -25,7 +25,7 @@ pub trait WeightInfo {
fn validate_identity() -> Weight;
fn change_owner_key() -> Weight;
fn revoke_identity() -> Weight;
- fn remove_identity() -> Weight;
+ fn force_remove_identity() -> Weight;
fn prune_item_identities_names(i: u32) -> Weight;
fn fix_sufficients() -> Weight;
fn link_account() -> Weight;
@@ -120,7 +120,7 @@ impl WeightInfo for () {
// Storage: Parameters ParametersStorage (r:1 w:0)
// Storage: Identity IdentityIndexOf (r:0 w:1)
// Storage: Identity IdentitiesNames (r:0 w:1)
- fn remove_identity() -> Weight {
+ fn force_remove_identity() -> Weight {
// Minimum execution time: 302_574 nanoseconds.
Weight::from_parts(504_132_000 as u64, 0)
.saturating_add(RocksDbWeight::get().reads(9 as u64))
diff --git a/pallets/membership/README.md b/pallets/membership/README.md
index ff9c1f0c6..116b2addd 100644
--- a/pallets/membership/README.md
+++ b/pallets/membership/README.md
@@ -1,3 +1,25 @@
# Duniter membership pallet
-Duniter membership is related to duniter Web of Trust and more specific than [parity membership pallet](https://github.com/paritytech/substrate/tree/master/frame/membership). It is used only internally by the identity, WoT, and distance pallets. In particular, it is adding the concept of "pending membership" which is an intermediate state where the identity is waiting to become member.
\ No newline at end of file
+Duniter membership is related to duniter Web of Trust and more specific than [parity membership pallet](https://github.com/paritytech/substrate/tree/master/frame/membership). It is used only internally by the identity, WoT, and distance pallets. In particular, it is adding the concept of "pending membership" which is an intermediate state where the identity is waiting to become member.
+
+## Main Web of Trust
+
+When used in conjunction with the main Web of Trust, the membership pallet is combined with the Duniter-WoT pallet and the identity pallet, resulting in the following functionality:
+
+- `request_membership` is automatically invoked when confirming identity and should not be called manually. It will add the identity to the pending membership.
+- `claim_membership` is automatically triggered during identity validation and should not be manually invoked. This process requires a pending membership, sufficient membership certificates, and a valid distance. Membership is granted upon successful completion of these requirements.
+- `renew_membership` requires a valid membership and a valid distance status to extend the validity period of a membership.
+- `revoke_membership` is automatically executed when a membership expires and should not be called manually.
+
+In practice, a new user creates an account, confirms identity using the `confirm_identity` call from the identity pallet, and is added to the pending membership. The user then validates it identity using the `validate_identity` call from the identity pallet, triggering a membership claim. If the certification and distance requirements are met, the identity is granted membership.
+
+## Sub Web of Trust Smith
+
+Functionality related to the Smith Web of Trust involves the following:
+
+- `request_membership` requires a validated identity for the member to be added to the pending membership.
+- `claim_membership` requires a pending membership, sufficient smith certificates, and a valid distance status for the identity to be included among the authority members.
+- `renew_membership` needs a valid membership and a valid distance status to extend the membership's validity period.
+- `revoke_membership` requires a valid origin to revoke the membership.
+
+In practice, a user must complete all steps to gain membership in the main Web Of Trust. They can then manually request smith membership using the `request_membership` call of the membership pallet. The membership can be claimed using the `claim_membership` call from the membership pallet, and if the identity meets smith certificate and distance requirements, it will be added to the authority members.
\ No newline at end of file
diff --git a/pallets/membership/src/benchmarking.rs b/pallets/membership/src/benchmarking.rs
index 8a7aacc71..f389dd596 100644
--- a/pallets/membership/src/benchmarking.rs
+++ b/pallets/membership/src/benchmarking.rs
@@ -22,7 +22,7 @@ use frame_benchmarking::benchmarks_instance_pallet;
use frame_support::dispatch::UnfilteredDispatchable;
use frame_system::pallet_prelude::BlockNumberFor;
use frame_system::RawOrigin;
-use sp_runtime::traits::Convert;
+use sp_runtime::traits::{Convert, One};
#[cfg(test)]
use maplit::btreemap;
@@ -53,7 +53,7 @@ benchmarks_instance_pallet! {
}
verify {
if T::CheckMembershipCallAllowed::check_idty_allowed_to_request_membership(&idty).is_ok() {
- assert_has_event::<T, I>(Event::<T, I>::MembershipRequested(idty).into());
+ assert_has_event::<T, I>(Event::<T, I>::PendingMembershipAdded{member: idty, expire_on: BlockNumberFor::<T>::one() + T::PendingMembershipPeriod::get()}.into());
}
}
claim_membership {
@@ -65,7 +65,7 @@ benchmarks_instance_pallet! {
T::BenchmarkSetupHandler::force_status_ok(&idty, &caller);
}: _<T::RuntimeOrigin>(caller_origin)
verify {
- assert_has_event::<T, I>(Event::<T, I>::MembershipAcquired(idty).into());
+ assert_has_event::<T, I>(Event::<T, I>::MembershipAdded{member: idty, expire_on: BlockNumberFor::<T>::one() + T::MembershipPeriod::get()}.into());
}
renew_membership {
let idty: T::IdtyId = 3.into();
@@ -74,7 +74,7 @@ benchmarks_instance_pallet! {
T::BenchmarkSetupHandler::force_status_ok(&idty, &caller);
}: _<T::RuntimeOrigin>(caller_origin)
verify {
- assert_has_event::<T, I>(Event::<T, I>::MembershipRenewed(idty).into());
+ assert_has_event::<T, I>(Event::<T, I>::MembershipAdded{member: idty, expire_on: BlockNumberFor::<T>::one() + T::MembershipPeriod::get()}.into());
}
revoke_membership {
let idty: T::IdtyId = 3.into();
@@ -82,7 +82,7 @@ benchmarks_instance_pallet! {
let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
}: _<T::RuntimeOrigin>(caller_origin)
verify {
- assert_has_event::<T, I>(Event::<T, I>::MembershipRevoked(idty).into());
+ assert_has_event::<T, I>(Event::<T, I>::MembershipRemoved{member: idty, reason: MembershipRemovalReason::Revoked}.into());
}
// Base weight of an empty initialize
on_initialize {
diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs
index 420fcf0ce..d58257699 100644
--- a/pallets/membership/src/lib.rs
+++ b/pallets/membership/src/lib.rs
@@ -54,6 +54,12 @@ impl<IdtyId, AccountId> SetupBenchmark<IdtyId, AccountId> for () {
fn add_cert(_issuer: &IdtyId, _receiver: &IdtyId) -> () {}
}
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
+pub enum MembershipRemovalReason {
+ Expired,
+ Revoked,
+}
+
#[frame_support::pallet]
pub mod pallet {
use super::*;
@@ -155,41 +161,38 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config<I>, I: 'static = ()> {
- /// A membership was acquired
- /// [idty_id]
- MembershipAcquired(T::IdtyId),
- /// A membership expired
- /// [idty_id]
- MembershipExpired(T::IdtyId),
- /// A membership was renewed
- /// [idty_id]
- MembershipRenewed(T::IdtyId),
- /// An membership was requested
- /// [idty_id]
- MembershipRequested(T::IdtyId),
- /// A membership was revoked
- /// [idty_id]
- MembershipRevoked(T::IdtyId),
- /// A pending membership request has expired
- /// [idty_id]
- PendingMembershipExpired(T::IdtyId),
+ /// A membership was added.
+ MembershipAdded {
+ member: T::IdtyId,
+ expire_on: BlockNumberFor<T>,
+ },
+ /// A membership was removed.
+ MembershipRemoved {
+ member: T::IdtyId,
+ reason: MembershipRemovalReason,
+ },
+ /// A pending membership was added.
+ PendingMembershipAdded {
+ member: T::IdtyId,
+ expire_on: BlockNumberFor<T>,
+ },
+ /// A pending membership has expired.
+ PendingMembershipExpired { member: T::IdtyId },
}
// ERRORS//
#[pallet::error]
pub enum Error<T, I = ()> {
- /// Identity id not found
+ /// Identity ID not found.
IdtyIdNotFound,
- /// Membership already acquired
+ /// Membership already acquired.
MembershipAlreadyAcquired,
- /// Membership already requested
+ /// Membership already requested.
MembershipAlreadyRequested,
- /// Membership not found
+ /// Membership not found.
MembershipNotFound,
- /// Origin not allowed to use this identity
- OriginNotAllowedToUseIdty,
- /// Membership request not found
+ /// Membership request not found.
MembershipRequestNotFound,
}
@@ -256,7 +259,6 @@ pub mod pallet {
// apply phase
Self::unschedule_membership_expiry(idty_id, membership_data.expire_on);
Self::insert_membership_and_schedule_expiry(idty_id);
- Self::deposit_event(Event::MembershipRenewed(idty_id));
T::OnEvent::on_event(&sp_membership::Event::MembershipRenewed(idty_id));
Ok(().into())
@@ -323,6 +325,10 @@ pub mod pallet {
Membership::<T, I>::insert(idty_id, MembershipData { expire_on });
MembershipsExpireOn::<T, I>::append(expire_on, idty_id);
+ Self::deposit_event(Event::MembershipAdded {
+ member: idty_id,
+ expire_on,
+ });
}
/// perform the membership request
@@ -341,8 +347,11 @@ pub mod pallet {
// apply membership request
PendingMembership::<T, I>::insert(idty_id, ());
PendingMembershipsExpireOn::<T, I>::append(expire_on, idty_id);
- Self::deposit_event(Event::MembershipRequested(idty_id));
- T::OnEvent::on_event(&sp_membership::Event::MembershipRequested(idty_id));
+ Self::deposit_event(Event::PendingMembershipAdded {
+ member: idty_id,
+ expire_on,
+ });
+ T::OnEvent::on_event(&sp_membership::Event::PendingMembershipAdded(idty_id));
Ok(().into())
}
@@ -360,8 +369,7 @@ pub mod pallet {
fn do_claim_membership(idty_id: T::IdtyId) {
if PendingMembership::<T, I>::take(idty_id).is_some() {
Self::insert_membership_and_schedule_expiry(idty_id);
- Self::deposit_event(Event::MembershipAcquired(idty_id));
- T::OnEvent::on_event(&sp_membership::Event::MembershipAcquired(idty_id));
+ T::OnEvent::on_event(&sp_membership::Event::MembershipAdded(idty_id));
}
// else { unreachable if check_allowed_to_claim called before }
}
@@ -370,8 +378,11 @@ pub mod pallet {
fn do_revoke_membership(idty_id: T::IdtyId) {
if let Some(membership_data) = Membership::<T, I>::take(idty_id) {
Self::unschedule_membership_expiry(idty_id, membership_data.expire_on);
- Self::deposit_event(Event::MembershipRevoked(idty_id));
- T::OnEvent::on_event(&sp_membership::Event::MembershipRevoked(idty_id));
+ Self::deposit_event(Event::MembershipRemoved {
+ member: idty_id,
+ reason: MembershipRemovalReason::Revoked,
+ });
+ T::OnEvent::on_event(&sp_membership::Event::MembershipRemoved(idty_id));
}
}
@@ -383,8 +394,11 @@ pub mod pallet {
PendingMembershipsExpireOn::<T, I>::append(expire_on, idty_id);
} // else should not happen
- Self::deposit_event(Event::MembershipExpired(idty_id));
- T::OnEvent::on_event(&sp_membership::Event::MembershipExpired(idty_id));
+ Self::deposit_event(Event::MembershipRemoved {
+ member: idty_id,
+ reason: MembershipRemovalReason::Expired,
+ });
+ T::OnEvent::on_event(&sp_membership::Event::MembershipRemoved(idty_id));
}
/// check the origin and get identity id if valid
@@ -415,7 +429,7 @@ pub mod pallet {
let mut expired_idty_count = 0u32;
for idty_id in PendingMembershipsExpireOn::<T, I>::take(block_number) {
if PendingMembership::<T, I>::take(idty_id).is_some() {
- Self::deposit_event(Event::PendingMembershipExpired(idty_id));
+ Self::deposit_event(Event::PendingMembershipExpired { member: idty_id });
T::OnEvent::on_event(&sp_membership::Event::PendingMembershipExpired(idty_id));
expired_idty_count = 0;
}
diff --git a/pallets/membership/src/tests.rs b/pallets/membership/src/tests.rs
index a899b4424..dfdd12bc3 100644
--- a/pallets/membership/src/tests.rs
+++ b/pallets/membership/src/tests.rs
@@ -15,6 +15,7 @@
// along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>.
use crate::mock::*;
+use crate::MembershipRemovalReason;
use crate::{Error, Event};
use frame_support::{assert_noop, assert_ok};
use maplit::btreemap;
@@ -83,12 +84,15 @@ fn test_membership_expiration() {
// Membership 0 should expire on block #3
run_to_block(3);
assert!(!DefaultMembership::is_member(&0));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipExpired(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRemoved {
+ member: 0,
+ reason: MembershipRemovalReason::Expired,
+ }));
// it should be added to pending membership and expire on block #6
run_to_block(6);
- System::assert_has_event(RtEvent::DefaultMembership(Event::PendingMembershipExpired(
- 0,
- )));
+ System::assert_has_event(RtEvent::DefaultMembership(
+ Event::PendingMembershipExpired { member: 0 },
+ ));
});
}
@@ -104,7 +108,10 @@ fn test_membership_renewal() {
assert_ok!(DefaultMembership::renew_membership(RuntimeOrigin::signed(
0
),));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRenewed(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipAdded {
+ member: 0,
+ expire_on: 2 + <Test as crate::Config>::MembershipPeriod::get(),
+ }));
// membership should not expire at block 3 to 6 because it has been renewed
run_to_block(3);
assert!(DefaultMembership::is_member(&0));
@@ -113,7 +120,10 @@ fn test_membership_renewal() {
// membership should expire at block 7 (2+5)
run_to_block(7);
assert!(!DefaultMembership::is_member(&0));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipExpired(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRemoved {
+ member: 0,
+ reason: MembershipRemovalReason::Expired,
+ }));
});
}
@@ -142,14 +152,20 @@ fn test_membership_revocation() {
assert_ok!(DefaultMembership::revoke_membership(RuntimeOrigin::signed(
0
),));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRevoked(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRemoved {
+ member: 0,
+ reason: MembershipRemovalReason::Revoked,
+ }));
// Membership 0 can re-request membership
run_to_block(5);
assert_ok!(DefaultMembership::request_membership(
RuntimeOrigin::signed(0),
));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRequested(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::PendingMembershipAdded {
+ member: 0,
+ expire_on: 5 + <Test as crate::Config>::PendingMembershipPeriod::get(),
+ }));
});
}
@@ -162,7 +178,10 @@ fn test_pending_membership_expiration() {
assert_ok!(DefaultMembership::request_membership(
RuntimeOrigin::signed(0),
));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRequested(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::PendingMembershipAdded {
+ member: 0,
+ expire_on: 1 + <Test as crate::Config>::PendingMembershipPeriod::get(),
+ }));
// Then, idty 0 shold still in pending memberships until PendingMembershipPeriod ended
run_to_block(PendingMembershipPeriod::get());
@@ -171,9 +190,9 @@ fn test_pending_membership_expiration() {
// Then, idty 0 request should expire after PendingMembershipPeriod
run_to_block(1 + PendingMembershipPeriod::get());
assert!(!DefaultMembership::is_in_pending_memberships(0));
- System::assert_has_event(RtEvent::DefaultMembership(Event::PendingMembershipExpired(
- 0,
- )));
+ System::assert_has_event(RtEvent::DefaultMembership(
+ Event::PendingMembershipExpired { member: 0 },
+ ));
})
}
@@ -190,14 +209,20 @@ fn test_membership_workflow() {
assert_ok!(DefaultMembership::request_membership(
RuntimeOrigin::signed(0),
));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRequested(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::PendingMembershipAdded {
+ member: 0,
+ expire_on: 1 + <Test as crate::Config>::PendingMembershipPeriod::get(),
+ }));
// - Then, idty 0 claim membership
run_to_block(2);
assert_ok!(DefaultMembership::claim_membership(RuntimeOrigin::signed(
0
),));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipAcquired(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipAdded {
+ member: 0,
+ expire_on: 2 + <Test as crate::Config>::MembershipPeriod::get(),
+ }));
// - Then, idty 0 claim renewal, should success
run_to_block(2);
@@ -212,6 +237,9 @@ fn test_membership_workflow() {
// - Then, idty 0 should expire after membership period
run_to_block(7); // 2 + 5
assert!(!DefaultMembership::is_member(&0));
- System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipExpired(0)));
+ System::assert_has_event(RtEvent::DefaultMembership(Event::MembershipRemoved {
+ member: 0,
+ reason: MembershipRemovalReason::Expired,
+ }));
});
}
diff --git a/pallets/offences/src/lib.rs b/pallets/offences/src/lib.rs
index 02316c4f6..f6b30289d 100644
--- a/pallets/offences/src/lib.rs
+++ b/pallets/offences/src/lib.rs
@@ -43,7 +43,7 @@ type ReportIdOf<T> = <T as frame_system::Config>::Hash;
pub enum SlashStrategy {
Disconnect,
- BlackList,
+ Blacklist,
}
#[frame_support::pallet]
@@ -95,9 +95,7 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event {
- /// There is an offence reported of the given `kind` happened at the `session_index` and
- /// (kind-specific) time slot. This event is not deposited for duplicate slashes.
- /// \[kind, timeslot\].
+ /// An offense was reported during the specified time slot. This event is not deposited for duplicate slashes.
Offence {
kind: Kind,
timeslot: OpaqueTimeSlot,
@@ -127,7 +125,7 @@ where
let slash_strategy = if O::ID == *b"im-online:offlin" {
SlashStrategy::Disconnect
} else {
- SlashStrategy::BlackList
+ SlashStrategy::Blacklist
};
T::OnOffenceHandler::on_offence(
diff --git a/pallets/oneshot-account/src/lib.rs b/pallets/oneshot-account/src/lib.rs
index 5cd932d7d..acee3cd7a 100644
--- a/pallets/oneshot-account/src/lib.rs
+++ b/pallets/oneshot-account/src/lib.rs
@@ -74,11 +74,13 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
+ /// A oneshot account was created.
OneshotAccountCreated {
account: T::AccountId,
balance: <T::Currency as Currency<T::AccountId>>::Balance,
creator: T::AccountId,
},
+ /// A oneshot account was consumed.
OneshotAccountConsumed {
account: T::AccountId,
dest1: (
@@ -90,6 +92,7 @@ pub mod pallet {
<T::Currency as Currency<T::AccountId>>::Balance,
)>,
},
+ /// A withdrawal was executed on a oneshot account.
Withdraw {
account: T::AccountId,
balance: <T::Currency as Currency<T::AccountId>>::Balance,
@@ -100,19 +103,19 @@ pub mod pallet {
#[pallet::error]
pub enum Error<T> {
- /// Block height is in the future
+ /// Block height is in the future.
BlockHeightInFuture,
- /// Block height is too old
+ /// Block height is too old.
BlockHeightTooOld,
- /// Destination account does not exist
+ /// Destination account does not exist.
DestAccountNotExist,
- /// Destination account has balance less than existential deposit
+ /// Destination account has a balance less than the existential deposit.
ExistentialDeposit,
- /// Source account has insufficient balance
+ /// Source account has insufficient balance.
InsufficientBalance,
- /// Destination oneshot account already exists
+ /// Destination oneshot account already exists.
OneshotAccountAlreadyCreated,
- /// Source oneshot account does not exist
+ /// Source oneshot account does not exist.
OneshotAccountNotExist,
}
diff --git a/pallets/provide-randomness/src/lib.rs b/pallets/provide-randomness/src/lib.rs
index bc6713960..5cce15f70 100644
--- a/pallets/provide-randomness/src/lib.rs
+++ b/pallets/provide-randomness/src/lib.rs
@@ -120,12 +120,12 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event {
- /// Filled randomness
+ /// A request for randomness was fulfilled.
FilledRandomness {
request_id: RequestId,
randomness: H256,
},
- /// Requested randomness
+ /// A request for randomness was made.
RequestedRandomness {
request_id: RequestId,
salt: H256,
@@ -137,8 +137,8 @@ pub mod pallet {
#[pallet::error]
pub enum Error<T> {
- /// The queue is full, pleasy retry later
- FullQueue,
+ /// Request randomness queue is full.
+ QueueFull,
}
// CALLS //
@@ -226,7 +226,7 @@ pub mod pallet {
// Verify phase
ensure!(
RequestsIds::<T>::count() < T::MaxRequests::get(),
- Error::<T>::FullQueue
+ Error::<T>::QueueFull
);
Self::pay_request(requestor)?;
diff --git a/pallets/quota/Cargo.toml b/pallets/quota/Cargo.toml
index 2c96eed66..efcc0dcfb 100644
--- a/pallets/quota/Cargo.toml
+++ b/pallets/quota/Cargo.toml
@@ -11,7 +11,10 @@ version = '3.0.0'
[features]
default = ['std']
-runtime-benchmarks = ['frame-benchmarking/runtime-benchmarks']
+runtime-benchmarks = [
+ 'frame-benchmarking/runtime-benchmarks',
+ 'pallet-identity/runtime-benchmarks',
+]
std = [
'codec/std',
'frame-support/std',
diff --git a/pallets/quota/src/lib.rs b/pallets/quota/src/lib.rs
index a2f21df21..f3a579cb2 100644
--- a/pallets/quota/src/lib.rs
+++ b/pallets/quota/src/lib.rs
@@ -111,37 +111,28 @@ pub mod pallet {
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
- /// Refunded fees to an account
+ /// Transaction fees were refunded.
Refunded {
who: T::AccountId,
identity: IdtyId<T>,
amount: BalanceOf<T>,
},
- // --- the following events let know that an error occured ---
- /// No quota for identity
+ /// No more quota available for refund.
NoQuotaForIdty(IdtyId<T>),
- /// No more currency available for refund
- // should never happen if the fees are going to the refund account
+ /// No more currency available for refund.
+ /// This scenario should never occur if the fees are intended for the refund account.
NoMoreCurrencyForRefund,
- /// Refund failed
- // for example when account is destroyed
+ /// The refund has failed.
+ /// This scenario should rarely occur, except when the account was destroyed in the interim between the request and the refund.
RefundFailed(T::AccountId),
- /// Refund queue full
+ /// Refund queue was full.
RefundQueueFull,
}
- // // ERRORS //
- // #[pallet::error]
- // pub enum Error<T> {
- // // no errors in on_idle
- // // instead events are emitted
- // }
-
- // // CALLS //
- // #[pallet::call]
- // impl<T: Config> Pallet<T> {
- // // no calls for this pallet, only automatic processing when idle
- // }
+ // This pallet only contains the `on_idle` hook and no call.
+ // Hooks are infallible by definition, so there are no error. To monitor no-ops
+ // from inside the quota pallet, we use events as mentioned in
+ // https://substrate.stackexchange.com/questions/9854/emitting-errors-from-hooks-like-on-initialize
// INTERNAL FUNCTIONS //
impl<T: Config> Pallet<T> {
diff --git a/primitives/membership/src/lib.rs b/primitives/membership/src/lib.rs
index f59fcde5d..fa5b992f9 100644
--- a/primitives/membership/src/lib.rs
+++ b/primitives/membership/src/lib.rs
@@ -28,17 +28,15 @@ use scale_info::TypeInfo;
use serde::{Deserialize, Serialize};
pub enum Event<IdtyId> {
- /// A membership has acquired
- MembershipAcquired(IdtyId),
- /// A membership has expired
- MembershipExpired(IdtyId),
- /// A membership has renewed
+ /// A membership was acquired.
+ MembershipAdded(IdtyId),
+ /// A membership was terminated.
+ MembershipRemoved(IdtyId),
+ /// A membership was renewed.
MembershipRenewed(IdtyId),
- /// An identity requested membership
- MembershipRequested(IdtyId),
- /// A membership has revoked
- MembershipRevoked(IdtyId),
- /// A pending membership request has expired
+ /// A pending membership request was added.
+ PendingMembershipAdded(IdtyId),
+ /// A pending membership request has expired.
PendingMembershipExpired(IdtyId),
}
diff --git a/resources/metadata.scale b/resources/metadata.scale
index 8cba70d82084d4a6c13159a9585ad29f6c8e7c00..a4239406fb5544df7692aff4f117176809213953 100644
GIT binary patch
delta 12920
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
K#rmFH{l5btbYsT=
delta 12709
zcmeG@3vg6bmhZfN9XcU_gna0Hd69(tLjnO4Odt&j5Fr2XCnQb!C27*#uhSorMlhfT
zr33^odPRkSaZph}nU-nLafa;5>@vHI;NT7*jHE_pU<EZZIwdnQyXU^woiyTB?bdG9
zR&8xn==a{e=bn4+x#ynmW&cjyt2=ceR>@@?GwoQ&Q~{Qg8A38NlVw5{*u9SmT0xr%
z5DVm(E{;4Nnnym+X`@RUt!7tewPal*Ih>tlyTGNBhjis+S!k3tD+qcP<dOG7r$Pz&
zCbUE_0BoX#k3u}D2^$Ah#2A(f^<+obBv|Y{9yT!~JiHp_%8oWkbahH(Ffwt)8mZ0b
zc1ohz<rLc;k|eG%T8uUXFgr!F&FOA$H@BH3n@e=bqTT4R;5gCP)+W2Lsm&o7U1r%P
z+8yRLDZhASPp6z4K+sGKQ4i(n<~JB^CfO>QO`_51G<Vn})2fwz1TAJ$uINzu@wJ(}
z5%tJ~-T-p9&0@B7NhYL98IClVT^>?Dq04(}T+3MC$gBr0jON6p$R?A+*rOwFrY_-m
zjzN&Zv>zl{8l-l&&BQQBl9SPIv;{~fU#5vunrdXR+bz3{V!P}>0@WE-)yUPdLz?4u
zI3!z}2f3x<;do&;sY_2MXVS$Yp-62M+l^+6WGYp^>fMrCn(MY$I6<iJ19Y=Cu^k%~
z!lE<gAmuF?v8lQ&SY&p(M7dqGs=F*A`@|lz#Udgll7mEL>f4RTc;vWE>UD`u2^lEc
z^2=8)k=jbtLCCk6&5LT?t`6C3>oB-oowCF1GD}W@dke}LT+@shsuWe3W^(ZTvl4se
z#QFcJsY+E`^W@t0cHAFH;36S6XbO(kk&et6vvXGt)7M-)Jce!Q{X;amPYr$^+`Ih5
zzA1r4JM)7v7O5B;B&)nmGTldm5PoAAVW-h4T4dxiW23{|(WyxC8VQBjp)g+&=n=l<
zYQfcsvagUI;!p@8$KH!2uB@c+U>eBItnuU74&FDtR!2@}<=+d;gmQKEs=n}gXzG+4
z%JD*Rl-t`;$dE9}E<0Q(swfSNpbqmo$tJdTnQf+4vD0X`OL%TX{|>eK1)&9drQTK)
zYtuByWUzToyVPdJ6PqQv%vMQsT4Yzg*u>T&Awrk<Oio7hqE#yyY_0;rAXYVdC*`~z
zHA=U^fP&UT>dInr*~w-n)ogNk)Om76xyL3sTDl}pb5RvG&yj8IW`|WW5yQm^WI|aU
zuRBa?%5qX%-#;o>v>B~ZGg)7j%j<f{Yh@`B1woL_<R8k8^Ex|uWM<NLIvDdpW_=5K
zk~%MX9OHKyiX5Y%%EWOx6R9na?@ROJGBsDI(!sQ5Wv|`rP$eX22<Ykp^1*;aNrn1e
z3=PQnp8GKHy4HIz^cee`xQPnr2%1GBgfvK~2%N~$?@+JNSq!#-0${ZCpu9Q)z$2)F
z*3=-alTj~z2T{6kA4v?60y=_*EHEUDyO)1j-F^cd^RJK?hk}N3@?BmqwZ*3b+5h`w
z@{^)5WYcU<nXaNn>Ji%{hl>fDVgmqHnw?I!<j6(K!JaM3!_=af3RLq_n}kA*-Q-Bs
zc(i`Es&*N4P5vW%FRsG>60V3`m1u>GX7b{K@@$4z*^7Je&L1W*Kuxo<x^$qk%#cJ*
z6ovo4j49s6|AvfZ{hyYxJfOz)kW3z1I3EhV|GY34ppbM|$C5GCQ(zh~R8Pj=?&?l-
z<StiVfihBFS3|V5R{z^T?IX(Dr}&#*-^d$)PJR>;>HbF{l<cdYKdxdfIu2+fRCmgT
zt^yg;P?22;P^@}jtf|RkmpBmWhP6>JI6LQ+3ffenZ?vNKxTSFbs=f1@)&f-1p-{*o
zR~Acw*RCaxLN)n(NjqN;^vDws@0FJx=F!hgTCs%rxX#s!$2J4U@giqrk4>CJezW>P
zFq5$@2Avt3LLxaUY3Ydb+FC++=qA0!+2HZMYrF>W-E4##IQ-)TT~QI|VGTvxMzYTo
zM}FBh7dDe9(<FW~kQ6?zxF0w?xi;BhHCp-sgeDGhWxM21RKjpmniVaj(Iq=PDh$_;
z*cxCf88Rg+ztJhErks)keTuEfw^}=MZcCR+%xjp*aa&2bln&b!5;jONu#4=H68K#T
z3FNXg6`mzy+Dl;%S=jzE>?L2cmrdOZLiilHM-ZCe0B{0_Kb-Qz9|R8naB+tqk~@TN
z8Xb1&xFg<{jt_bM80@;OCkxje;Ew~1S^))RCqZaLcrH`}dd06pim*+uQpsj`4?q`L
zBikfI6xk?S(bIYl5#!%`WMx+l43H<fQecR@(p8%<01!FHh@L7GTaBJIQVVj+ESt=2
zXUSMgVayN@MRnLMxtz7=G?{H2H$a*!d2pIMYDohvdDT*k@7F9Df)(HhsqbAyI;_dU
zF@R(E(M+yeC-7(B8F@7^*^>G5Kn&|vlR<pFgN=RsT_Bs~$Au^!&MIRid%h6Q!$->4
zuk4eAbY4NUimdNW5wZdw-*itv$triZl3qt5cu4uW7V;-Ys<4rVGYTG;GaV&kliWh?
zIJ1R*9<D0QkGZA_TY0#oe8jo4a1+bjo8cg->1`pY>r&tlqIwwD!A2(bWC&+?IIjTz
zuqP8q{5M+*$?lzqZ8g1{k;-$uPYPE9_)d5x!65m>^RRF;K<7K_C-9)bC9WnV562;G
zbq_B^G*>n>Fs2PnBq<x-yXU)M<F0$YS3I)ep6}{DCw>p~r6UP{=&M2!3O7xMn`B^f
zjCaGP2naNI2R7dT&20d(^NBd`-#ymFdh+`V9=HU$DiaI>+J4pPG)ay@loxcMAd)$O
z*U6^-xXeoc`uUO(J2@zFN^P>u)Y7SZ2la55fSl)J$*=p9k-tOznRuoXwyeN+_m(td
z#S2>=gzMzPEt8PIJ6kGopJqK##NP(GcRC~@VH5ZvjCG$#n(#G1fx%*t(Z6a$5}Zs_
zhwz`E)9bmff!un+h4SKE^W-mhCNbGhr9&F2dnyTleyPP6cmIwU?+Z`0Lg3r-?09d^
z_R_$2NTdl}u3^}{0WdbK>uH2iyS!U=c4`8By4^;7x!d01KpwRCLs6#y;TW1lkh)W`
zsUf0$vDz&fMZdevTyr%f&gWco@??nXQv%)A{GEAXD-La)fll~H+>D_p1|a@fO!?em
zj0w<1S3<uYBYH_n4B$dl?liV30X9akqPd*~02axJ!3-WvagEz078axjLWTgb=)y~;
zJ|xK{8z6WZF>|Se!!eFT)ganr7y5f_s(XkL*SZnC86y)13V{+dvkg)rWDHDJ*=3AD
z*O)D4i_61iZtHYAY+3oDLTtO_(1FVIVXnuJS9iY=;I8G_pQC8zK4(M?vg5gh*`Yj$
zE8WEpiBk%iQMGYe9<9PQE)*Y{7)2dM;4A(`k#C=?!l6gc7kJmvX_)`;9)A7?KFHzc
z3&#{VB&*SE!vMI&B`Zx{?Tfh@K9(oeRMevT5@rAoI(>~|AOsFS(hTZ`u>gWgszu}2
zDPtseZx4!MJWmf)K`J@5?+_$=*Z!aa(1yRc--2SEbYKT|ym6ocf4@9X%BS<BJZC(q
z{9z(O8h?08!)NiNJ9j*3f29bMG~d2jp&nSWVbf^xZ?AkCX!9CgTdT#7!$%sS@R_6I
z(J#;+EfJ>i=nD9b7Lfj<`Dke0KDrDYgx0sRLP~g{5xsz?-<m8|@u1IKk}Ec5aiCX^
zYfuwcLY{iF8bL3;nH6u~VZLOVGHqI6$&49|D4s@_+kuwCKoZ{)(<^!ZMocei=D146
z|8j-@Rro6CO87FKt5#;OADMme{j&!(arNZ4Z`DRDRuI%P1j~8aycmyd<FQoq|J}zj
zq1(Ifm<jMh<6QwpvfA5)zrXZO0g2r8rX`wrsAHzC)^5b;soHIEnT;ls0}Y=<O5e^1
zH6w1`%A*%yd3!245c}Vr7VpM&Ivw|~(@j2qTO51uIz1%$c&=X~TaUk^yrt2nGa<^`
z{F8LQe$bN_eeVPWSU#au;a`6K1fbaoZz5wy#ga`^Mv)UICkm$lT1od8(d3UOcMX4d
zUwEes_{}^$w-of=p?4Dm=qKT)=0JqE?o^h5_}0H)2xjl$_oo7C(rc&VhnsSL(ZFL*
z-#`8tA7tG>mE(u+pFS1%tvq?U<N@-FbCt@Wm`N6#Z&ThrfbHH#K1AEJ%e(5M7Qn|(
z|3wBUB~vawh(5{Miv$jkzg_$_Ixiny+K9h(m$Se?)?a=A++^=%5q+4ST^^6W|8hAc
zVGkdWifJendyv~2gCZ4s$(WBbLJu(ZN1-1>W`6vB%=|Ws(QFM4WyNjem!GC;MDYT-
z_32c68i;tk7N1v${rWUs6v-D??!Y1M4}M?3qwP(&wgYYcp=+<>Z_^;<-{ZZv2e&ha
z;^E)rCmrXZfXPCg<UsXfK^ZvCra#GZCwW@D6;di#Gjot4A>2K63OYS}uyZtk3gA1=
z(EuXABhDUzjyuicADv~z2=Lt8NoceGJBvE2F6ulvccUAod1v2D*5IS{*2~Pt5x%Gf
zW=!HjBHK`rD;|M&*B5^UwUy}p5{a%#{9h*d`@PqOqIAK1-uS<Cho}vs(^#U%j>$h4
z3mH<5{}SEb>`V77z3hI!ungCYe^+@miip%gE>zMoEj$K;bU+LFs=#N%b($CgDXPr-
znnQq@O~v?zXWAWducyU@A%z+o_#V>1&hPE^VeDYz1A#+b^eErXa9A6#x%XlcBOwFK
zbbcfxgW1=Psh$8FovDXJ-_N7rXS|;VwdKcg;0R3XLzs61A0d&L#j+^merF+D65x-J
zb^RVLRo~C0YL!bj>479DgxfTK5=`{{ISE#26o#bvdPL~r105j~p^k?kx-=aos0^bo
zqyvH5J{(ud`-h-*F+k{TCcCGB8={x8AQQf(d^QyGcX(Qw4b{S39-`3uG|*pVgO2~2
z#~4RXzs!c&45BCp`r_{Lx+JF^b1M!ha*1q4Cl2>hLy}kMNye!N`gsmKsPafpXXe6n
zWN2C*c#)wO^B~O6AHDCd`A8l%K3xEh@Svrs(;$w1*^FW3tf??AEL6h|7;q69GB7UD
zw{9xD4iLqlW@N-_)Mz9=C>n`HctJM^dM=)g#Lwgrlyd}iKx)u{R0f8H4NdSt&C=X=
zP_qyY7nns~nhr^H+;kWZc{F=E3d%IvFdap=g!W+%HX=YP%4}URjE^qVpvG{t2idwp
zn(-ja4rfLHJL(*=+)npQhY57|gRpS)bqtA^8_IDd>O>*MQ1u@pE2Ha+q0sNjM&IYk
za)yz$Ppb5Dt14*ml?u1?kz5ty0)AEdrj`KDL%nbMLvTd{i|Nzlpr<*rV0qMX4P;jK
zqLVe(V(f5o+;X+=$SfE;u2}<-?!qa>9M_DPw4*qqvPH3ye^P7Eq>?&rS~(<R;0eWx
z<hCwqH9*RENW#P7lx<G429g@oSB^6?_!*&AMxvzQx<}R&>-MAf1fh4U=nD)WMjwKt
z*=i{X1wscpv*{3RGeB0Thaq!oxQ#)`Hv5tF2O-<6BKwm8O2Yctn9Uk)tA=F9CHU%Q
z14gLZ>Fi3#4j)<nE)BiC4<%%GC5Zg98g%|r>2E3_6<qXAB_zjH%(mcq=PU7ilPuR-
z@Z1QiXx>~HuU}Mwv4Y<ztdU)ny_nfY;e3)d&xHr*rnwNO|B8W_(Q#rWFTcCZa;Egy
zT!_w**a%iaGFn6vYGkL`wWunnfaYfgmWE!UU(JOKnlukYc#W3LgY3j*eh>7!1cV5?
z>0|RCou01%JHJOmTGHZZ;e4ouy(8R<JK*Qu!65D(V6d_D<N44LdXRDNfQCCn_gCTJ
zZm)t8IKtlZ;tEO)7TkD~r^?nQThW8YBV2Bv|5^oNTCu-Nl$E+o05VW)Lhc}B=>nKI
zaS?J1Lj<h0sYL=2iv<4Uca>?j#n{%hi0)Vbd9aB7bOEe?Kt%XjR!!h^LK+*Zlor^V
znla}>>FkA&24S>gAxs`WTByVA5;1)v8iPt)bm(E|rV|#y>XHb|S1|9OL9L@O7x6eQ
zTF{*+;!d*Fzo+5wkJ<TTo*Pi!PHT#|)AT2cAcsGrLDxOr_w6D)@NkySt%2v@JiS^2
zCisZXu7zp%U}}&4xE99omo(_s$NN611ynItX;dQ^Vg`d)KgcG$$X%!HjgUX?rUtV*
zEZxQ3)UeDHcay%-2<y;lBsak<v=_}yP>){<ex`S^Nl~%4{k!^g5bCcP>f0Lbj<SMC
zj=QU2KJ`sh_VboN7wT~D68KeED8^EPPK@LtXyghgWa>QH_rX#q=OLE06h|~;pwAfA
zgq(_}i&uc0fIKW_O~a89mJ1_oMvpUs{&odq@W}#+IF&#jY=JSp$t&S?9#R$TndyGj
zj=t<L&UA%>P(1os_{QUBo`5cE8eO^?{vIjX>wuck7unWJHrd_LN$PII)2CY?y0oYQ
z&k?IYGZ|Tk2lTZ-gHoTc;gB^F7RRJ@MvI#jsYK<hVbpB#&<-c0<C*%z2?_LdCq&YB
zoiGvhvxZEnbHM}fJk4>zBzmqDCXK!@GC%EiK@L6Uf&^h(wXv7h8)1AXE1($LIwcdm
z>q0H^Je}Z%Nr}sFls{|HB&+ocR*FJV?xjXIq|i-n(8r&vQmP<g8wxF>S;BI@QjMVR
zx*;jMbPg6zn&ib;!E48wsEG^1D*<!-uuA1b0mcBFj$H>+q6*j)IPqL|$hgshot|HV
znvSUjG=eQ{FmH5;!09piHoA-@^jI6rg);h08yLq`3XsW0H@Yz7L)%dz5Mx0+ecS}K
zQ_6&3(`yj!Grb1fJ(OMcz_Sy{RkFGCG+Ba&Vyf8ARtp^dVP|Bez|{++??ZifOr^si
zJ1`~5K@;66fxfM?%3oc_%!Q(EL`*HI)x-IWHovBsgMGN8xaqC;4^aE+g20y;EoNLV
z4&a4O8qp33#$~KqL4!(qWTQBZaB8{i7L8bWWxIiHH_JM){DyLg0dq5~^f`P90D*cc
z7^*5(VjbqYAhgn%?YO%N6*XAS^b@X{3oUMoy&aNbO4(4>U1dWlMfWU3Xrc$&AvS51
z(j&Wui>I?asv;aEY@@$!hlzdn?zB!o{xGY8=@v$~qGXlwD-sn@mcpWYV64h@f^z>%
zBTNbtkUK%R6w(;`aJV8|%OzJsA1j<0*H|PJvXNb5Q+qIVq?9;WZ@GVEBi>cGU}yJ3
zWTQ!B*F2Q;f_jNWnWxS_fK`^%is3@Z!$k<Dkp^Zp#4t>RnN_aQ^&OC+86*6NzSsd-
z`K7qxM#fV=Z@IBTCpIa$GAFhNZ61En(;Xl-MhZ_V>{U<)M2{8!Y%YrjlUGJt2QFU$
zL2~??x!8#k6(uaYe<WU%G0_>FkkU6!coO}`PE3U{4TNHZrB*!AO2Q12XBHEiv7&)h
z4*XaRCcKKmMGK3R#^G~-2@T0qq_p8;R5^;l3XO78!6f6w6~=qTxe$&+SZHYI9L&(s
zD-|H2hxo@%SP0AM;5x|4(ibz%RGAQsswFs~X?VZ!`VGUQh!5Rm#^B0A-!!8$VCzAR
zRo??Kbbk+oj-NkLvL42x5$fmwLbRFGS^#zo>p$cbo0WMrYNs+y(D7n-i<Ao$X20l}
zMrQDrp@t`7=cj%xs<q9X;Goym!jrsFV1;M8zZcT9k7K3WOpkQI6kV*EF*Vb__QJ!X
zpF|8Jc0^BK@_>HSS4vJ*fk>ohJOO1X(V14L#eiss6*fUX9cx2PX;uu`1gqbWZ4NSI
zR#mxm3+Vj5VuOq^m~jY)BosKiMRL07$2M3AZe{#rkAM8epz$7M{7F8N+sM=<er{$@
zMBC2>#nB@&<mGG?Aa`~XUcYLTT#8NJDhOhrfz@_U!*VPa%57JsqSNi@DD0wDcJz`m
zsm%^?(OePQ51Z_2P)k^-wpY<N?V#`Dxn<Qxo2L@bAsS57i_R*W;t6va4m~l|qeA?d
zHF7{+I4#$Tm841w)_(A`<0Yt((Od|ZHgeNx6jy=1SrC5N;Y5e0VyQ#6bs#Bj3;nhm
zqu5Z68LRI9H~jyDhJVlhxr48SIeY(y&wSVc<qV>PAM~}Z2h8ywqH8w55_FJGZb0Ar
z2pzo<lQ2h=lNHOUc?$G~hn?AD0{OT)!M7Xpr9$X&c6?6?+)0}MC@hBe*dvM6;bW$-
ztAEPLz|*>$6?`yjjhFw>qOtpbxgu%|qtk<?!sYOY7PPz$#eo|=pwM?(&|^Hp{Pox~
zenoONNRgbOFF%G^oof2=V^D;T$j2cq`Ya>njKG~&Fnoj<K2kAU@?*Ffgy9n1{y01m
zdX<g2ByfYin0}x<W;hN%0Y8PC)choD#Xv-f7!>_7L?7G=lQBEhu@%z!I|ALY6_Unc
z-XKXS+7x3__^yCSrv$pS3nF~iw!&tXTQY3ND5K{oD4YenQe=kHkT&cnz%D*UNo9am
zi(68JIt^bqK@8PKXrr{T+IVfMHcwlq#USw5KJ?>Z8x%l<`o3rz<X{R)X@6!L2GNDv
z(1u;uh9P<ndyCo*lfsg<5MJppa$K?xNjVnDr)pUph=%Wj#E^70X%@}fhrxF`t-&V9
zQt>^$4^qaO0YrAUjJbUrm&bZ$K%wu}KKPpeM&D;I!%7|`-@I1<FGVb;KYkT5qpbi<
z`T|9xs&@sP8|m#=;UFd`$ZPNxJWDGMK@05h{pb+<16Iqa<qZ^^WAyLdfF3yRn{gP%
z0-W(JI09=h1x$||g$20AZ;oOX_BzdY6E?zi-@!M*!1Gu`y>Sc^oKe0X{TN=vQWPzJ
z8<s=5?}fK9a2Z{u5jdR@7tkrusNX^~{qO`dqm&n%gqOhJJ9`p7g1GZ|SE8uWF1K}7
zxYY|1dT|-=JMk_^EJd60GuVMeSKrZ}fd_<o%`TvYr=X46e*htL_bK>=X0c{JYs&CF
zJ^)iSV5BGB$1Uonm8UVSu#xti#yEc?J#rc{v1sf2&1rZ{quHtnq1|VYBKsM@>N|bm
z4BD+-zMr3gKWRqcEr6Fe<kHErm^j@-FP+8x-s=nd6&waUslE>&E1cc41nw=AT!^Q)
zK7g6X#hi1{fm|f#z@<5^X{KT4VGFWv*LnCFPWqnskmWX$Y2pQ>YJe`j01ML6dH5*@
zXEbAy=CNxsb|VB{^f4?tl7Kr)|DFvv@4I^etQu_=52tkW%MT#V*MAX{<8a9rdKuQ?
zy#l)F3N+yU{Q3$!$KTP=uB-4U3dHAE;R26A`TM_x#sm)!w>Zql#}xTX#{Rn$$ezMa
zkPlkA@)IZ-8!AKyY-O8y_=dxsfB6%bjwk3c_Q7cya}6qR(aWzvJFf23H9V^QbmJh%
zknFoXi0MuY!)tzr+0U)C>vv#*ll0>6V2Or%=VMy<DU=J`s!3X(`%@4A^P}spBOpiV
zb(~#82d;xS3Nr~fcOkuT9VWpv-`L-S4WNoX@&{brc6$B~5X+Yr(;I()1MK<K4XA^9
zdgTUW!(!jnA$SIo4)W+u>dHs_I;_#)U6RPi@~}wy)Stkl;a=ux(r2(58T9aHn6_=E
zFMkG=C^|PkgED+%+=2&U4`D(9A~TtN97a$~SKmSbH_;QfU=>mvdmEgZO)(;U>Nci*
zQS@%3;+E*(ZJ4b-W(iY(QyLzkKl~g#`~dGu{sN)^*E0D_@Mw<k96j<Sp1+e+GX(kJ
zyM)|a<*I$7dkx)q9pc$4mkl9W4c$D1EP0l`HiQZ{u-G#^W*Gi+i`_%(zrwn~_b&D<
zk2~=Fiyiy@i``3~|1;!<9}o(G3CnpN@_gt1j8y|TNJH;Hy5@jzh!);~9N{CZ9Q#`D
zKoed^p~wHqlnl-L7OObN>7s8zVmDU|^!T^Xjm9hEF7Dj`t-On3b)NEngA!qohbrH!
zzX4v)85CwEEp}nGA3c1yiK%INf#+FHJVnE|qs8dg@LSMggbRE{3}D6@k_s>?!hDR;
zG8?as4Eam~p95$>c4~Qod9Ab%ehJzU--ZxgfWEu<-xaiiIDby3)YgUG<_gInH%h2^
z9iiH7<w|QK-e+Ed{{aG>)(CB6vC`Jm>u-tDMiwY7^Dt(0nw_y)QH8+!`z{Q-U7mQY
dm>Iy{CZ%e(<tksQmWI6NbbKNjnr-RYe+RhU7S#X%
diff --git a/runtime/common/src/handlers.rs b/runtime/common/src/handlers.rs
index a6eecb1c2..194a9f3ac 100644
--- a/runtime/common/src/handlers.rs
+++ b/runtime/common/src/handlers.rs
@@ -48,7 +48,7 @@ where
match idty_event {
IdtyEvent::Validated => {
// when identity is validated, it starts getting right to UD
- // but this is handeled by membership event handler (MembershipAcquired)
+ // but this is handeled by membership event handler (MembershipAdded)
}
IdtyEvent::ChangedOwnerKey { new_owner_key } => {
if let Err(e) = pallet_authority_members::Pallet::<T>::change_owner_key(
@@ -79,8 +79,7 @@ impl<
fn on_event(membership_event: &sp_membership::Event<IdtyIndex>) {
(match membership_event {
// when membership is removed, call on_removed_member handler which auto claims UD
- sp_membership::Event::MembershipRevoked(idty_index)
- | sp_membership::Event::MembershipExpired(idty_index) => {
+ sp_membership::Event::MembershipRemoved(idty_index) => {
if let Some(idty_value) = pallet_identity::Identities::<Runtime>::get(idty_index) {
if let Some(first_ud_index) = idty_value.data.first_eligible_ud.into() {
pallet_universal_dividend::Pallet::<Runtime>::on_removed_member(
@@ -91,7 +90,7 @@ impl<
}
}
// when main membership is acquired, it starts getting right to UD
- sp_membership::Event::MembershipAcquired(idty_index) => {
+ sp_membership::Event::MembershipAdded(idty_index) => {
pallet_identity::Identities::<Runtime>::mutate_exists(idty_index, |idty_val_opt| {
if let Some(ref mut idty_val) = idty_val_opt {
idty_val.data = IdtyData {
@@ -104,7 +103,7 @@ impl<
}
// in other case, ther is nothing to do
sp_membership::Event::MembershipRenewed(_)
- | sp_membership::Event::MembershipRequested(_)
+ | sp_membership::Event::PendingMembershipAdded(_)
| sp_membership::Event::PendingMembershipExpired(_) => (),
});
Inner::on_event(membership_event)
@@ -126,11 +125,11 @@ impl<
{
fn on_event(membership_event: &sp_membership::Event<IdtyIndex>) {
(match membership_event {
- sp_membership::Event::MembershipAcquired(_idty_index) => {
+ sp_membership::Event::MembershipAdded(_idty_index) => {
// nothing when smith membership acquired
// user will have to claim authority membership
}
- sp_membership::Event::MembershipRevoked(idty_index) => {
+ sp_membership::Event::MembershipRemoved(idty_index) => {
let call = pallet_authority_members::Call::<Runtime>::remove_member {
member_id: *idty_index,
};
diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs
index bf101f98f..31bae949b 100644
--- a/runtime/common/src/pallets_config.rs
+++ b/runtime/common/src/pallets_config.rs
@@ -515,6 +515,7 @@ macro_rules! pallets_config {
type EvaluationPrice = frame_support::traits::ConstU64<1000>;
type MinAccessibleReferees = MinAccessibleReferees;
type ResultExpiration = frame_support::traits::ConstU32<720>;
+ type RuntimeEvent = RuntimeEvent;
type WeightInfo = common_runtime::weights::pallet_distance::WeightInfo<Runtime>;
}
diff --git a/runtime/common/src/providers.rs b/runtime/common/src/providers.rs
index 9680798aa..141714062 100644
--- a/runtime/common/src/providers.rs
+++ b/runtime/common/src/providers.rs
@@ -17,6 +17,7 @@
use crate::{entities::IdtyData, AccountId, IdtyIndex};
use core::marker::PhantomData;
use pallet_universal_dividend::FirstEligibleUd;
+use sp_runtime::DispatchError;
use sp_std::boxed::Box;
use sp_std::vec::Vec;
@@ -112,13 +113,16 @@ pub struct MainWotIsDistanceOk<T>(PhantomData<T>);
impl<T> pallet_duniter_wot::traits::IsDistanceOk<<T as pallet_identity::Config>::IdtyIndex>
for MainWotIsDistanceOk<T>
where
- T: pallet_distance::Config,
+ T: pallet_distance::Config + pallet_duniter_wot::Config<frame_support::instances::Instance1>,
{
- fn is_distance_ok(idty_id: &<T as pallet_identity::Config>::IdtyIndex) -> bool {
- matches!(
- pallet_distance::Pallet::<T>::identity_distance_status(idty_id),
- Some((_, pallet_distance::DistanceStatus::Valid))
- )
+ fn is_distance_ok(
+ idty_id: &<T as pallet_identity::Config>::IdtyIndex,
+ ) -> Result<(), DispatchError> {
+ match pallet_distance::Pallet::<T>::identity_distance_status(idty_id) {
+ Some((_, pallet_distance::DistanceStatus::Valid)) => Ok(()),
+ Some((_, pallet_distance::DistanceStatus::Invalid)) => Err(pallet_duniter_wot::Error::<T, frame_support::instances::Instance1>::DistanceIsInvalid.into()),
+ _ => Err(pallet_duniter_wot::Error::<T, frame_support::instances::Instance1>::DistanceNotEvaluated.into()),
+ }
}
}
diff --git a/runtime/common/src/weights/pallet_identity.rs b/runtime/common/src/weights/pallet_identity.rs
index 3dc9f9848..332be4f48 100644
--- a/runtime/common/src/weights/pallet_identity.rs
+++ b/runtime/common/src/weights/pallet_identity.rs
@@ -195,7 +195,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
/// Proof Skipped: Identity IdentitiesNames (max_values: None, max_size: None, mode: Measured)
/// Storage: Quota IdtyQuota (r:0 w:1)
/// Proof: Quota IdtyQuota (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
- fn remove_identity() -> Weight {
+ fn force_remove_identity() -> Weight {
// Proof Size summary in bytes:
// Measured: `1343`
// Estimated: `7283`
diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs
index c71865c95..8cef6bfcb 100644
--- a/runtime/g1/src/lib.rs
+++ b/runtime/g1/src/lib.rs
@@ -286,7 +286,7 @@ construct_runtime!(
Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 41,
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
- Distance: pallet_distance::{Pallet, Call, Storage, Inherent} = 44,
+ Distance: pallet_distance::{Pallet, Call, Storage, Inherent, Event<T>} = 44,
// Smith Sub-Wot
SmithSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs
index 82eb29bc9..f3b9ec5aa 100644
--- a/runtime/gdev/src/lib.rs
+++ b/runtime/gdev/src/lib.rs
@@ -340,7 +340,7 @@ construct_runtime!(
Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 41,
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
- Distance: pallet_distance::{Pallet, Call, Storage, Inherent} = 44,
+ Distance: pallet_distance::{Pallet, Call, Storage, Inherent, Event<T>} = 44,
// Smith Sub-Wot
SmithSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
diff --git a/runtime/gdev/tests/fixme_tests.rs b/runtime/gdev/tests/fixme_tests.rs
index 28b9777e8..2f4d55aac 100644
--- a/runtime/gdev/tests/fixme_tests.rs
+++ b/runtime/gdev/tests/fixme_tests.rs
@@ -22,6 +22,7 @@ mod common;
use common::*;
use frame_support::assert_ok;
use gdev_runtime::*;
+use pallet_membership::MembershipRemovalReason;
use sp_keyring::AccountKeyring;
/// issue #136
@@ -56,7 +57,10 @@ fn can_still_issue_cert_when_membership_lost() {
2, // Bob
));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipExpired(2),
+ pallet_membership::Event::MembershipRemoved {
+ member: 2,
+ reason: MembershipRemovalReason::Expired,
+ },
));
// FIXME this should not be possible
@@ -66,7 +70,7 @@ fn can_still_issue_cert_when_membership_lost() {
3, // Charlie
));
System::assert_has_event(RuntimeEvent::Cert(
- pallet_certification::Event::RenewedCert {
+ pallet_certification::Event::CertRenewed {
issuer: 2,
receiver: 3,
},
diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs
index 982a7ccc9..cb3819c84 100644
--- a/runtime/gdev/tests/integration_tests.rs
+++ b/runtime/gdev/tests/integration_tests.rs
@@ -24,6 +24,7 @@ use frame_support::{assert_noop, assert_ok};
use frame_support::{StorageHasher, Twox128};
use gdev_runtime::*;
use pallet_duniter_wot::IdtyRemovalWotReason;
+use pallet_membership::MembershipRemovalReason;
use sp_core::Encode;
use sp_keyring::AccountKeyring;
use sp_runtime::MultiAddress;
@@ -283,20 +284,23 @@ fn test_session_change() {
})
}
-/// test calling remove_identity
+/// test calling force_remove_identity
#[test]
-fn test_remove_identity() {
+fn test_force_remove_identity() {
ExtBuilder::new(1, 3, 4).build().execute_with(|| {
run_to_block(2);
// remove the identity
- assert_ok!(Identity::remove_identity(
+ assert_ok!(Identity::force_remove_identity(
frame_system::RawOrigin::Root.into(),
4,
None,
pallet_identity::IdtyRemovalReason::Manual
));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipRevoked(4),
+ pallet_membership::Event::MembershipRemoved {
+ member: 4,
+ reason: MembershipRemovalReason::Revoked,
+ },
));
System::assert_has_event(RuntimeEvent::Identity(
pallet_identity::Event::IdtyRemoved {
@@ -366,7 +370,12 @@ fn test_validate_identity_when_claim() {
));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipAcquired(5),
+ pallet_membership::Event::MembershipAdded {
+ member: 5,
+ expire_on: 76
+ + <Runtime as pallet_membership::Config<Instance1>>::MembershipPeriod::get(
+ ),
+ },
));
// ferdie can not validate eve identity because already validated
@@ -386,7 +395,10 @@ fn test_membership_expiry() {
ExtBuilder::new(1, 3, 4).build().execute_with(|| {
run_to_block(100);
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipExpired(1),
+ pallet_membership::Event::MembershipRemoved {
+ member: 1,
+ reason: MembershipRemovalReason::Expired,
+ },
));
// membership expiry should not trigger identity removal
assert!(!System::events().iter().any(|record| record.event
@@ -403,7 +415,10 @@ fn test_membership_expiry_with_identity_removal() {
run_to_block(100);
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipExpired(4),
+ pallet_membership::Event::MembershipRemoved {
+ member: 4,
+ reason: MembershipRemovalReason::Expired,
+ },
));
// Trigger pending membership expiry
@@ -448,7 +463,12 @@ fn test_membership_renewal() {
frame_system::RawOrigin::Signed(AccountKeyring::Alice.to_account_id()).into(),
));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipRenewed(1),
+ pallet_membership::Event::MembershipAdded {
+ member: 1,
+ expire_on: 76
+ + <Runtime as pallet_membership::Config<Instance1>>::MembershipPeriod::get(
+ ),
+ },
));
// renew at block 77
@@ -457,13 +477,21 @@ fn test_membership_renewal() {
frame_system::RawOrigin::Signed(AccountKeyring::Alice.to_account_id()).into(),
));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipRenewed(1),
+ pallet_membership::Event::MembershipAdded {
+ member: 1,
+ expire_on: 77
+ + <Runtime as pallet_membership::Config<Instance1>>::MembershipPeriod::get(
+ ),
+ },
));
// should expire at block 177 = 77+100
run_to_block(177);
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipExpired(1),
+ pallet_membership::Event::MembershipRemoved {
+ member: 1,
+ reason: MembershipRemovalReason::Expired,
+ },
));
});
}
@@ -493,7 +521,7 @@ fn test_remove_identity_after_one_ud() {
+ 1) as u32,
);
// remove identity
- assert_ok!(Identity::remove_identity(
+ assert_ok!(Identity::force_remove_identity(
frame_system::RawOrigin::Root.into(),
4,
None,
@@ -516,7 +544,10 @@ fn test_remove_identity_after_one_ud() {
}));
// membership and identity were actually removed
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipRevoked(4),
+ pallet_membership::Event::MembershipRemoved {
+ member: 4,
+ reason: MembershipRemovalReason::Revoked,
+ },
));
System::assert_has_event(RuntimeEvent::Identity(
pallet_identity::Event::IdtyRemoved {
@@ -595,7 +626,11 @@ fn test_ud_claimed_membership_on_and_off() {
frame_system::RawOrigin::Signed(AccountKeyring::Alice.to_account_id()).into()
));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipAcquired(1),
+ pallet_membership::Event::MembershipAdded {
+ member: 1,
+ expire_on: 14
+ + <Runtime as pallet_membership::Config<Instance1>>::MembershipPeriod::get(),
+ },
));
// UD number 3
@@ -636,7 +671,7 @@ fn test_remove_smith_identity() {
ExtBuilder::new(1, 3, 4).build().execute_with(|| {
run_to_block(2);
- assert_ok!(Identity::remove_identity(
+ assert_ok!(Identity::force_remove_identity(
frame_system::RawOrigin::Root.into(),
3,
None,
@@ -644,13 +679,19 @@ fn test_remove_smith_identity() {
));
// Verify events
System::assert_has_event(RuntimeEvent::SmithMembership(
- pallet_membership::Event::MembershipRevoked(3),
+ pallet_membership::Event::MembershipRemoved {
+ member: 3,
+ reason: MembershipRemovalReason::Revoked,
+ },
));
System::assert_has_event(RuntimeEvent::AuthorityMembers(
- pallet_authority_members::Event::MemberRemoved(3),
+ pallet_authority_members::Event::MemberRemoved { member: 3 },
));
System::assert_has_event(RuntimeEvent::Membership(
- pallet_membership::Event::MembershipRevoked(3),
+ pallet_membership::Event::MembershipRemoved {
+ member: 3,
+ reason: MembershipRemovalReason::Revoked,
+ },
));
System::assert_has_event(RuntimeEvent::Identity(
pallet_identity::Event::IdtyRemoved {
diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs
index 8ee543dc7..841a039fc 100644
--- a/runtime/gtest/src/lib.rs
+++ b/runtime/gtest/src/lib.rs
@@ -298,7 +298,7 @@ construct_runtime!(
Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 41,
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
- Distance: pallet_distance::{Pallet, Call, Storage, Inherent} = 44,
+ Distance: pallet_distance::{Pallet, Call, Storage, Inherent, Event<T>} = 44,
// Smith Sub-Wot
SmithSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
--
GitLab