git.delta.rocks / unique-network / refs/commits / 8dd8a836164d

difftreelog

Whitelist to allowlist renamed

str-mv2021-11-08parent: #6cd8e0c.patch.diff
in: master

9 files changed

modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -123,7 +123,7 @@
 			.checked_sub(amount)
 			.ok_or(<CommonError<T>>::TokenValueTooLow)?;
 
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			collection.check_allowlist(owner)?;
 		}
 
@@ -161,7 +161,7 @@
 			<CommonError<T>>::TransferNotAllowed
 		);
 
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			collection.check_allowlist(from)?;
 			collection.check_allowlist(to)?;
 		}
@@ -305,7 +305,7 @@
 		spender: &T::CrossAccountId,
 		amount: u128,
 	) -> DispatchResult {
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			collection.check_allowlist(&owner)?;
 			collection.check_allowlist(&spender)?;
 		}
@@ -333,7 +333,7 @@
 		if spender == from {
 			return Self::transfer(collection, from, to, amount);
 		}
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			// `from`, `to` checked in [`transfer`]
 			collection.check_allowlist(spender)?;
 		}
@@ -365,7 +365,7 @@
 		if spender == from {
 			return Self::burn(collection, from, amount);
 		}
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			// `from` checked in [`burn`]
 			collection.check_allowlist(spender)?;
 		}
modifiedpallets/nft/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nft/src/benchmarking.rs
+++ b/pallets/nft/src/benchmarking.rs
@@ -55,23 +55,23 @@
 		let collection = create_nft_collection::<T>(caller.clone())?;
 	}: _(RawOrigin::Signed(caller.clone()), collection)
 
-	add_to_white_list {
+	add_to_allow_list {
 		let caller: T::AccountId = account("caller", 0, SEED);
 		let whitelist_account: T::AccountId = account("admin", 0, SEED);
 		let collection = create_nft_collection::<T>(caller.clone())?;
 	}: _(RawOrigin::Signed(caller.clone()), collection, T::CrossAccountId::from_sub(whitelist_account))
 
-	remove_from_white_list {
+	remove_from_allow_list {
 		let caller: T::AccountId = account("caller", 0, SEED);
 		let whitelist_account: T::AccountId = account("admin", 0, SEED);
 		let collection = create_nft_collection::<T>(caller.clone())?;
-		<Pallet<T>>::add_to_white_list(RawOrigin::Signed(caller.clone()).into(), collection, T::CrossAccountId::from_sub(whitelist_account.clone()))?;
+		<Pallet<T>>::add_to_allow_list(RawOrigin::Signed(caller.clone()).into(), collection, T::CrossAccountId::from_sub(whitelist_account.clone()))?;
 	}: _(RawOrigin::Signed(caller.clone()), collection, T::CrossAccountId::from_sub(whitelist_account))
 
 	set_public_access_mode {
 		let caller: T::AccountId = account("caller", 0, SEED);
 		let collection = create_nft_collection::<T>(caller.clone())?;
-	}: _(RawOrigin::Signed(caller.clone()), collection, AccessMode::WhiteList)
+	}: _(RawOrigin::Signed(caller.clone()), collection, AccessMode::AllowList)
 
 	set_mint_permission {
 		let caller: T::AccountId = account("caller", 0, SEED);
modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -274,9 +274,9 @@
 		/// * collection_id.
 		///
 		/// * address.
-		#[weight = <SelfWeightOf<T>>::add_to_white_list()]
+		#[weight = <SelfWeightOf<T>>::add_to_allow_list()]
 		#[transactional]
-		pub fn add_to_white_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{
+		pub fn add_to_allow_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
@@ -303,9 +303,9 @@
 		/// * collection_id.
 		///
 		/// * address.
-		#[weight = <SelfWeightOf<T>>::remove_from_white_list()]
+		#[weight = <SelfWeightOf<T>>::remove_from_allow_list()]
 		#[transactional]
-		pub fn remove_from_white_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{
+		pub fn remove_from_allow_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
modifiedpallets/nft/src/tests.rsdiffbeforeafterboth
485		assert_ok!(TemplateModule::set_public_access_mode(485		assert_ok!(TemplateModule::set_public_access_mode(
486			origin1.clone(),486			origin1.clone(),
487			1,487			1,
488			AccessMode::WhiteList488			AccessMode::AllowList
489		));489		));
490		assert_ok!(TemplateModule::add_to_white_list(490		assert_ok!(TemplateModule::add_to_allow_list(
491			origin1.clone(),491			origin1.clone(),
492			1,492			1,
493			account(1)493			account(1)
494		));494		));
495		assert_ok!(TemplateModule::add_to_white_list(495		assert_ok!(TemplateModule::add_to_allow_list(
496			origin1.clone(),496			origin1.clone(),
497			1,497			1,
498			account(2)498			account(2)
499		));499		));
500		assert_ok!(TemplateModule::add_to_white_list(500		assert_ok!(TemplateModule::add_to_allow_list(
501			origin1.clone(),501			origin1.clone(),
502			1,502			1,
503			account(3)503			account(3)
549		assert_ok!(TemplateModule::set_public_access_mode(549		assert_ok!(TemplateModule::set_public_access_mode(
550			origin1.clone(),550			origin1.clone(),
551			1,551			1,
552			AccessMode::WhiteList552			AccessMode::AllowList
553		));553		));
554		assert_ok!(TemplateModule::add_to_white_list(554		assert_ok!(TemplateModule::add_to_allow_list(
555			origin1.clone(),555			origin1.clone(),
556			1,556			1,
557			account(1)557			account(1)
558		));558		));
559		assert_ok!(TemplateModule::add_to_white_list(559		assert_ok!(TemplateModule::add_to_allow_list(
560			origin1.clone(),560			origin1.clone(),
561			1,561			1,
562			account(2)562			account(2)
563		));563		));
564		assert_ok!(TemplateModule::add_to_white_list(564		assert_ok!(TemplateModule::add_to_allow_list(
565			origin1.clone(),565			origin1.clone(),
566			1,566			1,
567			account(3)567			account(3)
609		assert_ok!(TemplateModule::set_public_access_mode(609		assert_ok!(TemplateModule::set_public_access_mode(
610			origin1.clone(),610			origin1.clone(),
611			1,611			1,
612			AccessMode::WhiteList612			AccessMode::AllowList
613		));613		));
614		assert_ok!(TemplateModule::add_to_white_list(614		assert_ok!(TemplateModule::add_to_allow_list(
615			origin1.clone(),615			origin1.clone(),
616			1,616			1,
617			account(1)617			account(1)
618		));618		));
619		assert_ok!(TemplateModule::add_to_white_list(619		assert_ok!(TemplateModule::add_to_allow_list(
620			origin1.clone(),620			origin1.clone(),
621			1,621			1,
622			account(2)622			account(2)
623		));623		));
624		assert_ok!(TemplateModule::add_to_white_list(624		assert_ok!(TemplateModule::add_to_allow_list(
625			origin1.clone(),625			origin1.clone(),
626			1,626			1,
627			account(3)627			account(3)
765		assert_ok!(TemplateModule::set_public_access_mode(765		assert_ok!(TemplateModule::set_public_access_mode(
766			origin1.clone(),766			origin1.clone(),
767			collection_id,767			collection_id,
768			AccessMode::WhiteList768			AccessMode::AllowList
769		));769		));
770		assert_ok!(TemplateModule::add_to_white_list(770		assert_ok!(TemplateModule::add_to_allow_list(
771			origin1.clone(),771			origin1.clone(),
772			1,772			1,
773			account(1)773			account(1)
952		assert_ok!(TemplateModule::set_public_access_mode(952		assert_ok!(TemplateModule::set_public_access_mode(
953			origin1.clone(),953			origin1.clone(),
954			1,954			1,
955			AccessMode::WhiteList955			AccessMode::AllowList
956		));956		));
957		assert_ok!(TemplateModule::add_to_white_list(957		assert_ok!(TemplateModule::add_to_allow_list(
958			origin1.clone(),958			origin1.clone(),
959			1,959			1,
960			account(1)960			account(1)
961		));961		));
962		assert_ok!(TemplateModule::add_to_white_list(962		assert_ok!(TemplateModule::add_to_allow_list(
963			origin1.clone(),963			origin1.clone(),
964			1,964			1,
965			account(2)965			account(2)
966		));966		));
967		assert_ok!(TemplateModule::add_to_white_list(origin1, 1, account(3)));967		assert_ok!(TemplateModule::add_to_allow_list(origin1, 1, account(3)));
968968
969		assert_ok!(TemplateModule::transfer_from(969		assert_ok!(TemplateModule::transfer_from(
970			origin2,970			origin2,
992		let collection_id = create_test_collection(&CollectionMode::NFT, 1);992		let collection_id = create_test_collection(&CollectionMode::NFT, 1);
993993
994		let origin1 = Origin::signed(1);994		let origin1 = Origin::signed(1);
995		assert_ok!(TemplateModule::add_to_white_list(995		assert_ok!(TemplateModule::add_to_allow_list(
996			origin1,996			origin1,
997			collection_id,997			collection_id,
998			account(2)998			account(2)
1013			collection_id,1013			collection_id,
1014			account(2)1014			account(2)
1015		));1015		));
1016		assert_ok!(TemplateModule::add_to_white_list(1016		assert_ok!(TemplateModule::add_to_allow_list(
1017			origin2,1017			origin2,
1018			collection_id,1018			collection_id,
1019			account(3)1019			account(3)
10291029
1030		let origin2 = Origin::signed(2);1030		let origin2 = Origin::signed(2);
1031		assert_noop!(1031		assert_noop!(
1032			TemplateModule::add_to_white_list(origin2, collection_id, account(3)),1032			TemplateModule::add_to_allow_list(origin2, collection_id, account(3)),
1033			Error::<Test>::NoPermission1033			Error::<Test>::NoPermission
1034		);1034		);
1035	});1035	});
1041		let origin1 = Origin::signed(1);1041		let origin1 = Origin::signed(1);
10421042
1043		assert_noop!(1043		assert_noop!(
1044			TemplateModule::add_to_white_list(origin1, 1, account(2)),1044			TemplateModule::add_to_allow_list(origin1, 1, account(2)),
1045			Error::<Test>::CollectionNotFound1045			Error::<Test>::CollectionNotFound
1046		);1046		);
1047	});1047	});
1058			collection_id1058			collection_id
1059		));1059		));
1060		assert_noop!(1060		assert_noop!(
1061			TemplateModule::add_to_white_list(origin1, collection_id, account(2)),1061			TemplateModule::add_to_allow_list(origin1, collection_id, account(2)),
1062			Error::<Test>::CollectionNotFound1062			Error::<Test>::CollectionNotFound
1063		);1063		);
1064	});1064	});
1071		let collection_id = create_test_collection(&CollectionMode::NFT, 1);1071		let collection_id = create_test_collection(&CollectionMode::NFT, 1);
1072		let origin1 = Origin::signed(1);1072		let origin1 = Origin::signed(1);
10731073
1074		assert_ok!(TemplateModule::add_to_white_list(1074		assert_ok!(TemplateModule::add_to_allow_list(
1075			origin1.clone(),1075			origin1.clone(),
1076			collection_id,1076			collection_id,
1077			account(2)1077			account(2)
1078		));1078		));
1079		assert_ok!(TemplateModule::add_to_white_list(1079		assert_ok!(TemplateModule::add_to_allow_list(
1080			origin1,1080			origin1,
1081			collection_id,1081			collection_id,
1082			account(2)1082			account(2)
1091		let collection_id = create_test_collection(&CollectionMode::NFT, 1);1091		let collection_id = create_test_collection(&CollectionMode::NFT, 1);
10921092
1093		let origin1 = Origin::signed(1);1093		let origin1 = Origin::signed(1);
1094		assert_ok!(TemplateModule::add_to_white_list(1094		assert_ok!(TemplateModule::add_to_allow_list(
1095			origin1.clone(),1095			origin1.clone(),
1096			collection_id,1096			collection_id,
1097			account(2)1097			account(2)
1098		));1098		));
1099		assert_ok!(TemplateModule::remove_from_white_list(1099		assert_ok!(TemplateModule::remove_from_allow_list(
1100			origin1,1100			origin1,
1101			collection_id,1101			collection_id,
1102			account(2)1102			account(2)
1118			account(2)1118			account(2)
1119		));1119		));
11201120
1121		assert_ok!(TemplateModule::add_to_white_list(1121		assert_ok!(TemplateModule::add_to_allow_list(
1122			origin1,1122			origin1,
1123			collection_id,1123			collection_id,
1124			account(3)1124			account(3)
1125		));1125		));
1126		assert_ok!(TemplateModule::remove_from_white_list(1126		assert_ok!(TemplateModule::remove_from_allow_list(
1127			origin2,1127			origin2,
1128			collection_id,1128			collection_id,
1129			account(3)1129			account(3)
1139		let origin1 = Origin::signed(1);1139		let origin1 = Origin::signed(1);
1140		let origin2 = Origin::signed(2);1140		let origin2 = Origin::signed(2);
11411141
1142		assert_ok!(TemplateModule::add_to_white_list(1142		assert_ok!(TemplateModule::add_to_allow_list(
1143			origin1,1143			origin1,
1144			collection_id,1144			collection_id,
1145			account(2)1145			account(2)
1146		));1146		));
1147		assert_noop!(1147		assert_noop!(
1148			TemplateModule::remove_from_white_list(origin2, collection_id, account(2)),1148			TemplateModule::remove_from_allow_list(origin2, collection_id, account(2)),
1149			Error::<Test>::NoPermission1149			Error::<Test>::NoPermission
1150		);1150		);
1151		assert!(TemplateModule::white_list(collection_id, 2));1151		assert!(TemplateModule::white_list(collection_id, 2));
1158		let origin1 = Origin::signed(1);1158		let origin1 = Origin::signed(1);
11591159
1160		assert_noop!(1160		assert_noop!(
1161			TemplateModule::remove_from_white_list(origin1, 1, account(2)),1161			TemplateModule::remove_from_allow_list(origin1, 1, account(2)),
1162			Error::<Test>::CollectionNotFound1162			Error::<Test>::CollectionNotFound
1163		);1163		);
1164	});1164	});
1171		let origin1 = Origin::signed(1);1171		let origin1 = Origin::signed(1);
1172		let origin2 = Origin::signed(2);1172		let origin2 = Origin::signed(2);
11731173
1174		assert_ok!(TemplateModule::add_to_white_list(1174		assert_ok!(TemplateModule::add_to_allow_list(
1175			origin1.clone(),1175			origin1.clone(),
1176			collection_id,1176			collection_id,
1177			account(2)1177			account(2)
1178		));1178		));
1179		assert_ok!(TemplateModule::destroy_collection(origin1, collection_id));1179		assert_ok!(TemplateModule::destroy_collection(origin1, collection_id));
1180		assert_noop!(1180		assert_noop!(
1181			TemplateModule::remove_from_white_list(origin2, collection_id, account(2)),1181			TemplateModule::remove_from_allow_list(origin2, collection_id, account(2)),
1182			Error::<Test>::CollectionNotFound1182			Error::<Test>::CollectionNotFound
1183		);1183		);
1184		assert!(!TemplateModule::white_list(collection_id, 2));1184		assert!(!TemplateModule::white_list(collection_id, 2));
1192		let collection_id = create_test_collection(&CollectionMode::NFT, 1);1192		let collection_id = create_test_collection(&CollectionMode::NFT, 1);
1193		let origin1 = Origin::signed(1);1193		let origin1 = Origin::signed(1);
11941194
1195		assert_ok!(TemplateModule::add_to_white_list(1195		assert_ok!(TemplateModule::add_to_allow_list(
1196			origin1.clone(),1196			origin1.clone(),
1197			collection_id,1197			collection_id,
1198			account(2)1198			account(2)
1199		));1199		));
1200		assert_ok!(TemplateModule::remove_from_white_list(1200		assert_ok!(TemplateModule::remove_from_allow_list(
1201			origin1.clone(),1201			origin1.clone(),
1202			collection_id,1202			collection_id,
1203			account(2)1203			account(2)
1204		));1204		));
1205		assert_ok!(TemplateModule::remove_from_white_list(1205		assert_ok!(TemplateModule::remove_from_allow_list(
1206			origin1,1206			origin1,
1207			collection_id,1207			collection_id,
1208			account(2)1208			account(2)
1225		assert_ok!(TemplateModule::set_public_access_mode(1225		assert_ok!(TemplateModule::set_public_access_mode(
1226			origin1.clone(),1226			origin1.clone(),
1227			collection_id,1227			collection_id,
1228			AccessMode::WhiteList1228			AccessMode::AllowList
1229		));1229		));
1230		assert_ok!(TemplateModule::add_to_white_list(1230		assert_ok!(TemplateModule::add_to_allow_list(
1231			origin1.clone(),1231			origin1.clone(),
1232			collection_id,1232			collection_id,
1233			account(2)1233			account(2)
1252		assert_ok!(TemplateModule::set_public_access_mode(1252		assert_ok!(TemplateModule::set_public_access_mode(
1253			origin1.clone(),1253			origin1.clone(),
1254			collection_id,1254			collection_id,
1255			AccessMode::WhiteList1255			AccessMode::AllowList
1256		));1256		));
1257		assert_ok!(TemplateModule::add_to_white_list(1257		assert_ok!(TemplateModule::add_to_allow_list(
1258			origin1.clone(),1258			origin1.clone(),
1259			1,1259			1,
1260			account(1)1260			account(1)
1261		));1261		));
1262		assert_ok!(TemplateModule::add_to_white_list(1262		assert_ok!(TemplateModule::add_to_allow_list(
1263			origin1.clone(),1263			origin1.clone(),
1264			1,1264			1,
1265			account(2)1265			account(2)
1275		));1275		));
1276		assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);1276		assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);
12771277
1278		assert_ok!(TemplateModule::remove_from_white_list(1278		assert_ok!(TemplateModule::remove_from_allow_list(
1279			origin1.clone(),1279			origin1.clone(),
1280			1,1280			1,
1281			account(1)1281			account(1)
1302		assert_ok!(TemplateModule::set_public_access_mode(1302		assert_ok!(TemplateModule::set_public_access_mode(
1303			origin1.clone(),1303			origin1.clone(),
1304			collection_id,1304			collection_id,
1305			AccessMode::WhiteList1305			AccessMode::AllowList
1306		));1306		));
1307		assert_ok!(TemplateModule::add_to_white_list(1307		assert_ok!(TemplateModule::add_to_allow_list(
1308			origin1.clone(),1308			origin1.clone(),
1309			1,1309			1,
1310			account(1)1310			account(1)
1330		assert_ok!(TemplateModule::set_public_access_mode(1330		assert_ok!(TemplateModule::set_public_access_mode(
1331			origin1.clone(),1331			origin1.clone(),
1332			collection_id,1332			collection_id,
1333			AccessMode::WhiteList1333			AccessMode::AllowList
1334		));1334		));
1335		assert_ok!(TemplateModule::add_to_white_list(1335		assert_ok!(TemplateModule::add_to_allow_list(
1336			origin1.clone(),1336			origin1.clone(),
1337			collection_id,1337			collection_id,
1338			account(1)1338			account(1)
1339		));1339		));
1340		assert_ok!(TemplateModule::add_to_white_list(1340		assert_ok!(TemplateModule::add_to_allow_list(
1341			origin1.clone(),1341			origin1.clone(),
1342			collection_id,1342			collection_id,
1343			account(2)1343			account(2)
1353		));1353		));
1354		assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);1354		assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);
13551355
1356		assert_ok!(TemplateModule::remove_from_white_list(1356		assert_ok!(TemplateModule::remove_from_allow_list(
1357			origin1.clone(),1357			origin1.clone(),
1358			collection_id,1358			collection_id,
1359			account(2)1359			account(2)
1380		assert_ok!(TemplateModule::set_public_access_mode(1380		assert_ok!(TemplateModule::set_public_access_mode(
1381			origin1.clone(),1381			origin1.clone(),
1382			collection_id,1382			collection_id,
1383			AccessMode::WhiteList1383			AccessMode::AllowList
1384		));1384		));
1385		assert_noop!(1385		assert_noop!(
1386			TemplateModule::burn_item(origin1.clone(), 1, 1, 5),1386			TemplateModule::burn_item(origin1.clone(), 1, 1, 5),
1403		assert_ok!(TemplateModule::set_public_access_mode(1403		assert_ok!(TemplateModule::set_public_access_mode(
1404			origin1.clone(),1404			origin1.clone(),
1405			collection_id,1405			collection_id,
1406			AccessMode::WhiteList1406			AccessMode::AllowList
1407		));1407		));
14081408
1409		// do approve1409		// do approve
1429		assert_ok!(TemplateModule::set_public_access_mode(1429		assert_ok!(TemplateModule::set_public_access_mode(
1430			origin1.clone(),1430			origin1.clone(),
1431			collection_id,1431			collection_id,
1432			AccessMode::WhiteList1432			AccessMode::AllowList
1433		));1433		));
1434		assert_ok!(TemplateModule::add_to_white_list(1434		assert_ok!(TemplateModule::add_to_allow_list(
1435			origin1.clone(),1435			origin1.clone(),
1436			collection_id,1436			collection_id,
1437			account(1)1437			account(1)
1438		));1438		));
1439		assert_ok!(TemplateModule::add_to_white_list(1439		assert_ok!(TemplateModule::add_to_allow_list(
1440			origin1.clone(),1440			origin1.clone(),
1441			collection_id,1441			collection_id,
1442			account(2)1442			account(2)
1459		assert_ok!(TemplateModule::set_public_access_mode(1459		assert_ok!(TemplateModule::set_public_access_mode(
1460			origin1.clone(),1460			origin1.clone(),
1461			collection_id,1461			collection_id,
1462			AccessMode::WhiteList1462			AccessMode::AllowList
1463		));1463		));
1464		assert_ok!(TemplateModule::add_to_white_list(1464		assert_ok!(TemplateModule::add_to_allow_list(
1465			origin1.clone(),1465			origin1.clone(),
1466			collection_id,1466			collection_id,
1467			account(1)1467			account(1)
1468		));1468		));
1469		assert_ok!(TemplateModule::add_to_white_list(1469		assert_ok!(TemplateModule::add_to_allow_list(
1470			origin1.clone(),1470			origin1.clone(),
1471			collection_id,1471			collection_id,
1472			account(2)1472			account(2)
1503		assert_ok!(TemplateModule::set_public_access_mode(1503		assert_ok!(TemplateModule::set_public_access_mode(
1504			origin1.clone(),1504			origin1.clone(),
1505			collection_id,1505			collection_id,
1506			AccessMode::WhiteList1506			AccessMode::AllowList
1507		));1507		));
1508		assert_ok!(TemplateModule::set_mint_permission(1508		assert_ok!(TemplateModule::set_mint_permission(
1509			origin1,1509			origin1,
1528		assert_ok!(TemplateModule::set_public_access_mode(1528		assert_ok!(TemplateModule::set_public_access_mode(
1529			origin1.clone(),1529			origin1.clone(),
1530			collection_id,1530			collection_id,
1531			AccessMode::WhiteList1531			AccessMode::AllowList
1532		));1532		));
1533		assert_ok!(TemplateModule::set_mint_permission(1533		assert_ok!(TemplateModule::set_mint_permission(
1534			origin1.clone(),1534			origin1.clone(),
1563		assert_ok!(TemplateModule::set_public_access_mode(1563		assert_ok!(TemplateModule::set_public_access_mode(
1564			origin1.clone(),1564			origin1.clone(),
1565			collection_id,1565			collection_id,
1566			AccessMode::WhiteList1566			AccessMode::AllowList
1567		));1567		));
1568		assert_ok!(TemplateModule::set_mint_permission(1568		assert_ok!(TemplateModule::set_mint_permission(
1569			origin1.clone(),1569			origin1.clone(),
1570			collection_id,1570			collection_id,
1571			false1571			false
1572		));1572		));
1573		assert_ok!(TemplateModule::add_to_white_list(1573		assert_ok!(TemplateModule::add_to_allow_list(
1574			origin1,1574			origin1,
1575			collection_id,1575			collection_id,
1576			account(2)1576			account(2)
1595		assert_ok!(TemplateModule::set_public_access_mode(1595		assert_ok!(TemplateModule::set_public_access_mode(
1596			origin1.clone(),1596			origin1.clone(),
1597			collection_id,1597			collection_id,
1598			AccessMode::WhiteList1598			AccessMode::AllowList
1599		));1599		));
1600		assert_ok!(TemplateModule::set_mint_permission(1600		assert_ok!(TemplateModule::set_mint_permission(
1601			origin1,1601			origin1,
1621		assert_ok!(TemplateModule::set_public_access_mode(1621		assert_ok!(TemplateModule::set_public_access_mode(
1622			origin1.clone(),1622			origin1.clone(),
1623			collection_id,1623			collection_id,
1624			AccessMode::WhiteList1624			AccessMode::AllowList
1625		));1625		));
1626		assert_ok!(TemplateModule::set_mint_permission(1626		assert_ok!(TemplateModule::set_mint_permission(
1627			origin1,1627			origin1,
1646		assert_ok!(TemplateModule::set_public_access_mode(1646		assert_ok!(TemplateModule::set_public_access_mode(
1647			origin1.clone(),1647			origin1.clone(),
1648			collection_id,1648			collection_id,
1649			AccessMode::WhiteList1649			AccessMode::AllowList
1650		));1650		));
1651		assert_ok!(TemplateModule::set_mint_permission(1651		assert_ok!(TemplateModule::set_mint_permission(
1652			origin1.clone(),1652			origin1.clone(),
1681		assert_ok!(TemplateModule::set_public_access_mode(1681		assert_ok!(TemplateModule::set_public_access_mode(
1682			origin1.clone(),1682			origin1.clone(),
1683			collection_id,1683			collection_id,
1684			AccessMode::WhiteList1684			AccessMode::AllowList
1685		));1685		));
1686		assert_ok!(TemplateModule::set_mint_permission(1686		assert_ok!(TemplateModule::set_mint_permission(
1687			origin1,1687			origin1,
1708		assert_ok!(TemplateModule::set_public_access_mode(1708		assert_ok!(TemplateModule::set_public_access_mode(
1709			origin1.clone(),1709			origin1.clone(),
1710			collection_id,1710			collection_id,
1711			AccessMode::WhiteList1711			AccessMode::AllowList
1712		));1712		));
1713		assert_ok!(TemplateModule::set_mint_permission(1713		assert_ok!(TemplateModule::set_mint_permission(
1714			origin1.clone(),1714			origin1.clone(),
1715			collection_id,1715			collection_id,
1716			true1716			true
1717		));1717		));
1718		assert_ok!(TemplateModule::add_to_white_list(1718		assert_ok!(TemplateModule::add_to_allow_list(
1719			origin1,1719			origin1,
1720			collection_id,1720			collection_id,
1721			account(2)1721			account(2)
2056			collection_id,2056			collection_id,
2057			true2057			true
2058		));2058		));
2059		assert_ok!(TemplateModule::add_to_white_list(2059		assert_ok!(TemplateModule::add_to_allow_list(
2060			origin1.clone(),2060			origin1.clone(),
2061			collection_id,2061			collection_id,
2062			account(1)2062			account(1)
2124			collection_id,2124			collection_id,
2125			true2125			true
2126		));2126		));
2127		assert_ok!(TemplateModule::add_to_white_list(2127		assert_ok!(TemplateModule::add_to_allow_list(
2128			origin2.clone(),2128			origin2.clone(),
2129			collection_id,2129			collection_id,
2130			account(1)2130			account(1)
2177			collection_id,2177			collection_id,
2178			true2178			true
2179		));2179		));
2180		assert_ok!(TemplateModule::add_to_white_list(2180		assert_ok!(TemplateModule::add_to_allow_list(
2181			origin2.clone(),2181			origin2.clone(),
2182			collection_id,2182			collection_id,
2183			account(1)2183			account(1)
modifiedpallets/nft/src/weights.rsdiffbeforeafterboth
--- a/pallets/nft/src/weights.rs
+++ b/pallets/nft/src/weights.rs
@@ -33,8 +33,8 @@
 pub trait WeightInfo {
 	fn create_collection() -> Weight;
 	fn destroy_collection() -> Weight;
-	fn add_to_white_list() -> Weight;
-	fn remove_from_white_list() -> Weight;
+	fn add_to_allow_list() -> Weight;
+	fn remove_from_allow_list() -> Weight;
 	fn set_public_access_mode() -> Weight;
 	fn set_mint_permission() -> Weight;
 	fn change_collection_owner() -> Weight;
@@ -75,14 +75,14 @@
 	}
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Common Allowlist (r:0 w:1)
-	fn add_to_white_list() -> Weight {
+	fn add_to_allow_list() -> Weight {
 		(6_629_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Common Allowlist (r:0 w:1)
-	fn remove_from_white_list() -> Weight {
+	fn remove_from_allow_list() -> Weight {
 		(6_596_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -205,14 +205,14 @@
 	}
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Common Allowlist (r:0 w:1)
-	fn add_to_white_list() -> Weight {
+	fn add_to_allow_list() -> Weight {
 		(6_629_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Common Allowlist (r:0 w:1)
-	fn remove_from_white_list() -> Weight {
+	fn remove_from_allow_list() -> Weight {
 		(6_596_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -169,7 +169,7 @@
 			<CommonError<T>>::NoPermission
 		);
 
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			collection.check_allowlist(sender)?;
 		}
 
@@ -227,7 +227,7 @@
 			<CommonError<T>>::NoPermission
 		);
 
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			collection.check_allowlist(from)?;
 			collection.check_allowlist(to)?;
 		}
@@ -445,7 +445,7 @@
 		token: TokenId,
 		spender: Option<&T::CrossAccountId>,
 	) -> DispatchResult {
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			collection.check_allowlist(&sender)?;
 			if let Some(spender) = spender {
 				collection.check_allowlist(&spender)?;
@@ -480,7 +480,7 @@
 		if spender == from {
 			return Self::transfer(collection, from, to, token);
 		}
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			// `from`, `to` checked in [`transfer`]
 			collection.check_allowlist(spender)?;
 		}
@@ -508,7 +508,7 @@
 		if spender == from {
 			return Self::burn(collection, from, token);
 		}
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			// `from` checked in [`burn`]
 			collection.check_allowlist(spender)?;
 		}
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -272,7 +272,7 @@
 			<CommonError<T>>::TransferNotAllowed
 		);
 
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			collection.check_allowlist(from)?;
 			collection.check_allowlist(to)?;
 		}
@@ -483,7 +483,7 @@
 		token: TokenId,
 		amount: u128,
 	) -> DispatchResult {
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			collection.check_allowlist(&sender)?;
 			collection.check_allowlist(&spender)?;
 		}
@@ -514,7 +514,7 @@
 		if spender == from {
 			return Self::transfer(collection, from, to, token, amount);
 		}
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			// `from`, `to` checked in [`transfer`]
 			collection.check_allowlist(spender)?;
 		}
@@ -547,7 +547,7 @@
 		if spender == from {
 			return Self::burn(collection, from, token, amount);
 		}
-		if collection.access == AccessMode::WhiteList {
+		if collection.access == AccessMode::AllowList {
 			// `from` checked in [`burn`]
 			collection.check_allowlist(spender)?;
 		}
modifiedprimitives/nft/src/lib.rsdiffbeforeafterboth
--- a/primitives/nft/src/lib.rs
+++ b/primitives/nft/src/lib.rs
@@ -141,7 +141,7 @@
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub enum AccessMode {
 	Normal,
-	WhiteList,
+	AllowList,
 }
 impl Default for AccessMode {
 	fn default() -> Self {
modifiedruntime/src/chain_extension.rsdiffbeforeafterboth
--- a/runtime/src/chain_extension.rs
+++ b/runtime/src/chain_extension.rs
@@ -75,10 +75,10 @@
 }
 
 #[derive(Debug, PartialEq, Encode, Decode, MaxEncodedLen)]
-pub struct NFTExtToggleWhiteList<AccountId> {
+pub struct NFTExtToggleAllowList<AccountId> {
 	pub collection_id: u32,
 	pub address: AccountId,
-	pub whitelisted: bool,
+	pub allowlisted: bool,
 }
 
 /// The chain Extension of NFT pallet
@@ -213,8 +213,8 @@
 			6 => {
 				// Toggle whitelist
 				let mut env = env.buf_in_buf_out();
-				let input: NFTExtToggleWhiteList<AccountIdOf<C>> = env.read_as()?;
-				env.charge_weight(NftWeightInfoOf::<C>::add_to_white_list())?;
+				let input: NFTExtToggleAllowList<AccountIdOf<C>> = env.read_as()?;
+				env.charge_weight(NftWeightInfoOf::<C>::add_to_allow_list())?;
 
 				let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
 
@@ -222,7 +222,7 @@
 					&C::CrossAccountId::from_sub(env.ext().address().clone()),
 					&collection,
 					&C::CrossAccountId::from_sub(input.address),
-					input.whitelisted,
+					input.allowlisted,
 				)?;
 
 				collection.submit_logs()?;