Merge branch 'master' into release-1.15.2

Author: Ad96el

dip-template/runtimes/dip-consumer/Cargo.toml

@@ -33,7 +33,7 @@ frame-executive                            = { workspace = true }
 frame-support                              = { workspace = true }
 frame-system                               = { workspace = true }
 frame-system-rpc-runtime-api               = { workspace = true }
-pallet-aura                                = { workspace = true }
+pallet-aura                                = { workspace = true, features = ["experimental"] }
 pallet-authorship                          = { workspace = true }
 pallet-balances                            = { workspace = true }
 pallet-session                             = { workspace = true }

dip-template/runtimes/dip-consumer/src/lib.rs

@@ -369,6 +369,7 @@ impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
+	type SlotDuration = ConstU64<SLOT_DURATION>;
 }
 
 impl cumulus_pallet_aura_ext::Config for Runtime {}

dip-template/runtimes/dip-provider/Cargo.toml

@@ -33,7 +33,7 @@ frame-executive                            = { workspace = true }
 frame-support                              = { workspace = true }
 frame-system                               = { workspace = true }
 frame-system-rpc-runtime-api               = { workspace = true }
-pallet-aura                                = { workspace = true }
+pallet-aura                                = { workspace = true, features = ["experimental"] }
 pallet-authorship                          = { workspace = true }
 pallet-balances                            = { workspace = true }
 pallet-session                             = { workspace = true }

dip-template/runtimes/dip-provider/src/lib.rs

@@ -370,6 +370,7 @@ impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
+	type SlotDuration = ConstU64<SLOT_DURATION>;
 }
 
 impl cumulus_pallet_aura_ext::Config for Runtime {}

integration-tests/emulated/Cargo.toml

@@ -12,7 +12,7 @@ version       = { workspace = true }
 
 [dependencies]
 asset-hub-rococo-emulated-chain   = { workspace = true, default-features = true }
-asset-hub-rococo-runtime          = { workspace = true, default-features = true }
+asset-hub-rococo-runtime          = { workspace = true, default-features = true, features = ["experimental"] }
 attestation                       = { workspace = true, default-features = true }
 ctype                             = { workspace = true, default-features = true }
 cumulus-primitives-core           = { workspace = true, default-features = true }

logs.txt

@@ -193,7 +193,7 @@ pub(crate) mod runtime {
 	use ctype::{CtypeCreatorOf, CtypeEntryOf};
 	use kilt_support::mock::{mock_origin, SubjectId};
 
-	use crate::{self as attestation, Event};
+	use crate::{self as attestation};
 
 	type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -206,20 +206,6 @@ pub(crate) mod runtime {
 	pub const MILLI_UNIT: Balance = 10u128.pow(12);
 	pub const ATTESTATION_DEPOSIT: Balance = 10 * MILLI_UNIT;
 
-	pub(crate) fn events() -> Vec<Event<Test>> {
-		System::events()
-			.into_iter()
-			.map(|r| r.event)
-			.filter_map(|e| {
-				if let RuntimeEvent::Attestation(e) = e {
-					Some(e)
-				} else {
-					None
-				}
-			})
-			.collect::<Vec<_>>()
-	}
-
 	frame_support::construct_runtime!(
 		pub enum Test
 		{
@@ -246,7 +232,7 @@ pub(crate) mod runtime {
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Block = Block;
 		type Nonce = u64;
-		type RuntimeEvent = RuntimeEvent;
+		type RuntimeEvent = ();
 		type BlockHashCount = BlockHashCount;
 		type DbWeight = RocksDbWeight;
 		type Version = ();
@@ -279,7 +265,7 @@ pub(crate) mod runtime {
 		type MaxFreezes = MaxFreezes;
 		type Balance = Balance;
 		type DustRemoval = ();
-		type RuntimeEvent = RuntimeEvent;
+		type RuntimeEvent = ();
 		type ExistentialDeposit = ExistentialDeposit;
 		type AccountStore = System;
 		type WeightInfo = ();
@@ -297,7 +283,7 @@ pub(crate) mod runtime {
 		type EnsureOrigin = mock_origin::EnsureDoubleOrigin<AccountId, Self::CtypeCreatorId>;
 		type OriginSuccess = mock_origin::DoubleOrigin<AccountId, Self::CtypeCreatorId>;
 		type OverarchingOrigin = EnsureSigned<AccountId>;
-		type RuntimeEvent = RuntimeEvent;
+		type RuntimeEvent = ();
 		type WeightInfo = ();
 
 		type Currency = Balances;
@@ -319,7 +305,7 @@ pub(crate) mod runtime {
 	impl Config for Test {
 		type EnsureOrigin = mock_origin::EnsureDoubleOrigin<AccountId, AttesterOf<Self>>;
 		type OriginSuccess = mock_origin::DoubleOrigin<AccountId, AttesterOf<Self>>;
-		type RuntimeEvent = RuntimeEvent;
+		type RuntimeEvent = ();
 		type WeightInfo = ();
 		type RuntimeHoldReason = RuntimeHoldReason;
 		type Currency = Balances;
@@ -386,10 +372,6 @@ pub(crate) mod runtime {
 			let mut ext = sp_io::TestExternalities::new(storage);
 
 			ext.execute_with(|| {
-				// ensure that we are not at the genesis block. Events are not registered for
-				// the genesis block.
-				System::set_block_number(System::block_number() + 1);
-
 				for ctype in self.ctypes {
 					ctype::Ctypes::<Test>::insert(
 						ctype.0,

pallets/attestation/src/mock.rs

@@ -21,44 +21,35 @@ use frame_support::{assert_noop, assert_ok};
 use kilt_support::mock::mock_origin::DoubleOrigin;
 use sp_runtime::DispatchError;
 
-use crate::{self as attestation, mock::*, AttestationAccessControl, AttesterOf, Config, Event};
+use crate::{self as attestation, mock::*, AttestationAccessControl, AttesterOf, Config};
 
 #[test]
 fn test_attest_without_authorization() {
 	let attester: AttesterOf<Test> = sr25519_did_from_public_key(&ALICE_SEED);
 	let claim_hash = claim_hash_from_seed(CLAIM_HASH_SEED_01);
-	let ctype = get_ctype_hash::<Test>(true);
+	let ctype_hash = get_ctype_hash::<Test>(true);
 	let authorization_info = None;
 
 	ExtBuilder::default()
-		.with_ctypes(vec![(ctype, attester.clone())])
+		.with_ctypes(vec![(ctype_hash, attester.clone())])
 		.with_balances(vec![(ACCOUNT_00, <Test as Config>::Deposit::get() * 100)])
 		.build_and_execute_with_sanity_tests(|| {
 			assert_ok!(Attestation::add(
 				DoubleOrigin(ACCOUNT_00, attester.clone()).into(),
 				claim_hash,
-				ctype,
+				ctype_hash,
 				authorization_info.clone()
 			));
 			let stored_attestation =
 				Attestation::attestations(claim_hash).expect("Attestation should be present on chain.");
 
-			assert_eq!(stored_attestation.ctype_hash, ctype);
+			assert_eq!(stored_attestation.ctype_hash, ctype_hash);
 			assert_eq!(stored_attestation.attester, attester);
 			assert_eq!(
 				stored_attestation.authorization_id,
 				authorization_info.map(|ac| ac.authorization_id())
 			);
 			assert!(!stored_attestation.revoked);
-			assert_eq!(
-				events(),
-				vec![Event::AttestationCreated {
-					attester: attester.clone(),
-					claim_hash,
-					ctype_hash: ctype,
-					authorization: None
-				}]
-			);
 		});
 }
 
@@ -90,15 +81,6 @@ fn test_attest_authorized() {
 				authorization_info.map(|ac| ac.authorization_id())
 			);
 			assert!(!stored_attestation.revoked);
-			assert_eq!(
-				events(),
-				vec![Event::AttestationCreated {
-					attester: attester.clone(),
-					claim_hash,
-					ctype_hash: ctype,
-					authorization: Some(attester)
-				}]
-			);
 		});
 }
 
@@ -114,14 +96,14 @@ fn test_attest_unauthorized() {
 		.with_ctypes(vec![(ctype, attester.clone())])
 		.with_balances(vec![(ACCOUNT_00, <Test as Config>::Deposit::get() * 100)])
 		.build_and_execute_with_sanity_tests(|| {
-			assert_noop!(
+			assert_eq!(
 				Attestation::add(
 					DoubleOrigin(ACCOUNT_00, attester.clone()).into(),
 					claim_hash,
 					ctype,
 					authorization_info
 				),
-				DispatchError::Other("Unauthorized")
+				Err(DispatchError::Other("Unauthorized"))
 			);
 		});
 }

pallets/attestation/src/tests/claim.rs

@@ -20,14 +20,14 @@ use frame_support::{assert_noop, assert_ok, traits::fungible::InspectHold};
 use kilt_support::mock::mock_origin::DoubleOrigin;
 use sp_runtime::traits::Zero;
 
-use crate::{self as attestation, mock::*, AttesterOf, Config, Event, HoldReason};
+use crate::{self as attestation, mock::*, AttesterOf, Config, HoldReason};
 
 #[test]
 fn test_remove() {
 	let attester: AttesterOf<Test> = sr25519_did_from_public_key(&ALICE_SEED);
 	let claim_hash = claim_hash_from_seed(CLAIM_HASH_SEED_01);
 	let attestation = generate_base_attestation::<Test>(attester.clone(), ACCOUNT_00);
-	let ctype_hash = attestation.ctype_hash;
+	let authorization_info = None;
 
 	ExtBuilder::default()
 		.with_balances(vec![(ACCOUNT_00, <Test as Config>::Deposit::get() * 100)])
@@ -37,57 +37,9 @@ fn test_remove() {
 			assert_ok!(Attestation::remove(
 				DoubleOrigin(ACCOUNT_00, attester.clone()).into(),
 				claim_hash,
-				None
-			));
-			assert!(Attestation::attestations(claim_hash).is_none());
-			assert_eq!(
-				events(),
-				vec![
-					Event::AttestationRevoked {
-						attester: attester.clone(),
-						claim_hash,
-						authorized_by: attestation::authorized_by::AuthorizedBy::Attester(attester.clone()),
-						ctype_hash,
-					},
-					Event::AttestationRemoved {
-						attester: attester.clone(),
-						claim_hash,
-						authorized_by: attestation::authorized_by::AuthorizedBy::Attester(attester.clone()),
-						ctype_hash,
-					}
-				]
-			);
-		});
-}
-
-#[test]
-fn test_remove_revoked() {
-	let attester: AttesterOf<Test> = sr25519_did_from_public_key(&ALICE_SEED);
-	let claim_hash = claim_hash_from_seed(CLAIM_HASH_SEED_01);
-	let mut attestation = generate_base_attestation::<Test>(attester.clone(), ACCOUNT_00);
-	attestation.revoked = true;
-	let ctype_hash = attestation.ctype_hash;
-
-	ExtBuilder::default()
-		.with_balances(vec![(ACCOUNT_00, <Test as Config>::Deposit::get() * 100)])
-		.with_ctypes(vec![(attestation.ctype_hash, attester.clone())])
-		.with_attestations(vec![(claim_hash, attestation)])
-		.build_and_execute_with_sanity_tests(|| {
-			assert_ok!(Attestation::remove(
-				DoubleOrigin(ACCOUNT_00, attester.clone()).into(),
-				claim_hash,
-				None
+				authorization_info
 			));
 			assert!(Attestation::attestations(claim_hash).is_none());
-			assert_eq!(
-				events(),
-				vec![Event::AttestationRemoved {
-					attester: attester.clone(),
-					claim_hash,
-					ctype_hash,
-					authorized_by: attestation::authorized_by::AuthorizedBy::Attester(attester.clone())
-				}]
-			);
 		});
 }
 
@@ -96,10 +48,9 @@ fn test_remove_authorized() {
 	let attester: AttesterOf<Test> = sr25519_did_from_public_key(&ALICE_SEED);
 	let revoker: AttesterOf<Test> = sr25519_did_from_public_key(&BOB_SEED);
 	let claim_hash = claim_hash_from_seed(CLAIM_HASH_SEED_01);
-	let mut attestation = generate_base_attestation::<Test>(attester.clone(), ACCOUNT_00);
+	let mut attestation = generate_base_attestation::<Test>(attester, ACCOUNT_00);
 	attestation.authorization_id = Some(revoker.clone());
 	let authorization_info = Some(MockAccessControl(revoker.clone()));
-	let ctype_hash = attestation.ctype_hash;
 
 	ExtBuilder::default()
 		.with_balances(vec![(ACCOUNT_00, <Test as Config>::Deposit::get() * 100)])
@@ -113,23 +64,6 @@ fn test_remove_authorized() {
 			));
 			assert!(Attestation::attestations(claim_hash).is_none());
 			assert!(!Attestation::external_attestations(revoker.clone(), claim_hash));
-			assert_eq!(
-				events(),
-				vec![
-					Event::AttestationRevoked {
-						attester: attester.clone(),
-						claim_hash,
-						ctype_hash,
-						authorized_by: attestation::authorized_by::AuthorizedBy::Authorization(revoker.clone())
-					},
-					Event::AttestationRemoved {
-						attester: attester.clone(),
-						claim_hash,
-						ctype_hash,
-						authorized_by: attestation::authorized_by::AuthorizedBy::Authorization(revoker.clone())
-					}
-				]
-			);
 		});
 }