diff --git a/pallets/certification/src/benchmarking.rs b/pallets/certification/src/benchmarking.rs
index 5539c79813e69e19e9290960258a4fd60c201eb9..f265a95f7e1d06fa6edbb7c00f67a7a99c063290 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 760264bc243b8fd90cb77d95f170aeae8adfac26..6074908e27aaf08423bf0f46dba96892f73c8a76 100644
--- a/pallets/certification/src/lib.rs
+++ b/pallets/certification/src/lib.rs
@@ -225,22 +225,18 @@ pub mod pallet {
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config<I>, I: 'static = ()> {
/// A new certification was added.
- NewCert {
+ CertAdded {
issuer: T::IdtyIndex,
- issuer_issued_count: u32,
receiver: T::IdtyIndex,
- receiver_received_count: u32,
},
/// A certification was removed.
- RemovedCert {
+ CertRemoved {
issuer: T::IdtyIndex,
- issuer_issued_count: u32,
receiver: T::IdtyIndex,
- receiver_received_count: u32,
expiration: bool,
},
/// A certification was renewed.
- RenewedCert {
+ CertRenewed {
issuer: T::IdtyIndex,
receiver: T::IdtyIndex,
},
@@ -434,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,
@@ -452,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())
@@ -513,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 85678840938019ffd22d7d616dc1b38b5fdf61fc..cf09fa72de745ddf9eafd3eaa9718866b196cfcd 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/duniter-wot/src/tests.rs b/pallets/duniter-wot/src/tests.rs
index b26cbd841113b1325788df7d06056d33ce5c58df..020b71064633ee3d80a6e07f7d1813796e4021e3 100644
--- a/pallets/duniter-wot/src/tests.rs
+++ b/pallets/duniter-wot/src/tests.rs
@@ -185,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);
@@ -222,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
@@ -468,11 +464,9 @@ 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,
},
));
@@ -494,11 +488,9 @@ 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,
},
));
@@ -586,11 +578,9 @@ 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,
},
));
@@ -636,11 +626,9 @@ 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,
},
));
diff --git a/runtime/gdev/tests/fixme_tests.rs b/runtime/gdev/tests/fixme_tests.rs
index db10c71c0af004e75f35f924f8e0d6ba76081929..6feabb630c97d7c8868fd28b4b97ca28bda87f0e 100644
--- a/runtime/gdev/tests/fixme_tests.rs
+++ b/runtime/gdev/tests/fixme_tests.rs
@@ -70,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,
},