Skip to content

Commit 7fcebc8

Browse files
gui1117gui1117
authored
improve test (paritytech#9835)
1 parent 0df7093 commit 7fcebc8

1 file changed

Lines changed: 9 additions & 243 deletions

File tree

‎frame/support/test/tests/pallet.rs‎

Lines changed: 9 additions & 243 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ frame_support::construct_runtime!(
553553
NodeBlock = Block,
554554
UncheckedExtrinsic = UncheckedExtrinsic
555555
{
556-
System: frame_system::{Pallet, Call, Event<T>},
556+
System: frame_system::{Call, Event<T>},
557557
Example: pallet::{Pallet, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned},
558558
Example2: pallet2::{Pallet, Call, Event, Config<T>, Storage},
559559
}
@@ -1000,52 +1000,6 @@ fn metadata() {
10001000
use frame_support::metadata::*;
10011001

10021002
let pallets = vec![
1003-
PalletMetadata {
1004-
index: 0,
1005-
name: "System",
1006-
storage: None,
1007-
calls: Some(meta_type::<frame_system::Call<Runtime>>().into()),
1008-
event: Some(meta_type::<frame_system::Event<Runtime>>().into()),
1009-
constants: vec![
1010-
PalletConstantMetadata {
1011-
name: "BlockWeights",
1012-
ty: meta_type::<frame_system::limits::BlockWeights>(),
1013-
value: vec![],
1014-
docs: vec![],
1015-
},
1016-
PalletConstantMetadata {
1017-
name: "BlockLength",
1018-
ty: meta_type::<frame_system::limits::BlockLength>(),
1019-
value: vec![],
1020-
docs: vec![],
1021-
},
1022-
PalletConstantMetadata {
1023-
name: "BlockHashCount",
1024-
ty: meta_type::<u32>(),
1025-
value: vec![],
1026-
docs: vec![],
1027-
},
1028-
PalletConstantMetadata {
1029-
name: "DbWeight",
1030-
ty: meta_type::<frame_support::weights::RuntimeDbWeight>(),
1031-
value: vec![],
1032-
docs: vec![],
1033-
},
1034-
PalletConstantMetadata {
1035-
name: "Version",
1036-
ty: meta_type::<sp_version::RuntimeVersion>(),
1037-
value: vec![],
1038-
docs: vec![],
1039-
},
1040-
PalletConstantMetadata {
1041-
name: "SS58Prefix",
1042-
ty: meta_type::<u16>(),
1043-
value: vec![],
1044-
docs: vec![],
1045-
},
1046-
],
1047-
error: Some(meta_type::<frame_system::Error<Runtime>>().into()),
1048-
},
10491003
PalletMetadata {
10501004
index: 1,
10511005
name: "Example",
@@ -1255,226 +1209,38 @@ fn metadata() {
12551209
error: Some(PalletErrorMetadata { ty: meta_type::<pallet::Error<Runtime>>() }),
12561210
},
12571211
PalletMetadata {
1258-
index: 1,
1259-
name: "Example",
1212+
index: 2,
1213+
name: "Example2",
12601214
storage: Some(PalletStorageMetadata {
1261-
prefix: "Example",
1215+
prefix: "Example2",
12621216
entries: vec![
12631217
StorageEntryMetadata {
1264-
name: "ValueWhereClause",
1265-
modifier: StorageEntryModifier::Optional,
1266-
ty: StorageEntryType::Plain(meta_type::<u64>()),
1267-
default: vec![0],
1268-
docs: vec![],
1269-
},
1270-
StorageEntryMetadata {
1271-
name: "Value",
1218+
name: "SomeValue",
12721219
modifier: StorageEntryModifier::Optional,
1273-
ty: StorageEntryType::Plain(meta_type::<u32>()),
1220+
ty: StorageEntryType::Plain(meta_type::<Vec<u32>>()),
12741221
default: vec![0],
12751222
docs: vec![],
12761223
},
12771224
StorageEntryMetadata {
1278-
name: "Value2",
1279-
modifier: StorageEntryModifier::Optional,
1280-
ty: StorageEntryType::Plain(meta_type::<u64>()),
1281-
default: vec![0],
1282-
docs: vec![],
1283-
},
1284-
StorageEntryMetadata {
1285-
name: "Map",
1286-
modifier: StorageEntryModifier::Default,
1287-
ty: StorageEntryType::Map {
1288-
key: meta_type::<u8>(),
1289-
value: meta_type::<u16>(),
1290-
hashers: vec![StorageHasher::Blake2_128Concat],
1291-
},
1292-
default: vec![4, 0],
1293-
docs: vec![],
1294-
},
1295-
StorageEntryMetadata {
1296-
name: "Map2",
1225+
name: "SomeCountedStorageMap",
12971226
modifier: StorageEntryModifier::Optional,
12981227
ty: StorageEntryType::Map {
1299-
key: meta_type::<u16>(),
1300-
value: meta_type::<u32>(),
13011228
hashers: vec![StorageHasher::Twox64Concat],
1302-
},
1303-
default: vec![0],
1304-
docs: vec![],
1305-
},
1306-
StorageEntryMetadata {
1307-
name: "DoubleMap",
1308-
modifier: StorageEntryModifier::Optional,
1309-
ty: StorageEntryType::Map {
1310-
value: meta_type::<u32>(),
1311-
key: meta_type::<(u8, u16)>(),
1312-
hashers: vec![
1313-
StorageHasher::Blake2_128Concat,
1314-
StorageHasher::Twox64Concat,
1315-
],
1316-
},
1317-
default: vec![0],
1318-
docs: vec![],
1319-
},
1320-
StorageEntryMetadata {
1321-
name: "DoubleMap2",
1322-
modifier: StorageEntryModifier::Optional,
1323-
ty: StorageEntryType::Map {
1324-
value: meta_type::<u64>(),
1325-
key: meta_type::<(u16, u32)>(),
1326-
hashers: vec![
1327-
StorageHasher::Twox64Concat,
1328-
StorageHasher::Blake2_128Concat,
1329-
],
1330-
},
1331-
default: vec![0],
1332-
docs: vec![],
1333-
},
1334-
StorageEntryMetadata {
1335-
name: "NMap",
1336-
modifier: StorageEntryModifier::Optional,
1337-
ty: StorageEntryType::Map {
13381229
key: meta_type::<u8>(),
1339-
hashers: vec![StorageHasher::Blake2_128Concat],
13401230
value: meta_type::<u32>(),
13411231
},
13421232
default: vec![0],
13431233
docs: vec![],
13441234
},
13451235
StorageEntryMetadata {
1346-
name: "NMap2",
1347-
modifier: StorageEntryModifier::Optional,
1348-
ty: StorageEntryType::Map {
1349-
key: meta_type::<(u16, u32)>(),
1350-
hashers: vec![
1351-
StorageHasher::Twox64Concat,
1352-
StorageHasher::Blake2_128Concat,
1353-
],
1354-
value: meta_type::<u64>(),
1355-
},
1356-
default: vec![0],
1357-
docs: vec![],
1358-
},
1359-
#[cfg(feature = "conditional-storage")]
1360-
StorageEntryMetadata {
1361-
name: "ConditionalValue",
1362-
modifier: StorageEntryModifier::Optional,
1363-
ty: StorageEntryType::Plain(meta_type::<u32>()),
1364-
default: vec![0],
1365-
docs: vec![],
1366-
},
1367-
#[cfg(feature = "conditional-storage")]
1368-
StorageEntryMetadata {
1369-
name: "ConditionalMap",
1370-
modifier: StorageEntryModifier::Optional,
1371-
ty: StorageEntryType::Map {
1372-
key: meta_type::<u16>(),
1373-
value: meta_type::<u32>(),
1374-
hashers: vec![StorageHasher::Twox64Concat],
1375-
},
1376-
default: vec![0],
1377-
docs: vec![],
1378-
},
1379-
#[cfg(feature = "conditional-storage")]
1380-
StorageEntryMetadata {
1381-
name: "ConditionalDoubleMap",
1382-
modifier: StorageEntryModifier::Optional,
1383-
ty: StorageEntryType::Map {
1384-
value: meta_type::<u32>(),
1385-
key: meta_type::<(u8, u16)>(),
1386-
hashers: vec![
1387-
StorageHasher::Blake2_128Concat,
1388-
StorageHasher::Twox64Concat,
1389-
],
1390-
},
1391-
default: vec![0],
1392-
docs: vec![],
1393-
},
1394-
#[cfg(feature = "conditional-storage")]
1395-
StorageEntryMetadata {
1396-
name: "ConditionalNMap",
1397-
modifier: StorageEntryModifier::Optional,
1398-
ty: StorageEntryType::Map {
1399-
key: meta_type::<(u8, u16)>(),
1400-
hashers: vec![
1401-
StorageHasher::Blake2_128Concat,
1402-
StorageHasher::Twox64Concat,
1403-
],
1404-
value: meta_type::<u32>(),
1405-
},
1406-
default: vec![0],
1407-
docs: vec![],
1408-
},
1409-
StorageEntryMetadata {
1410-
name: "RenamedCountedMap",
1411-
modifier: StorageEntryModifier::Optional,
1412-
ty: StorageEntryType::Map {
1413-
hashers: vec![StorageHasher::Twox64Concat],
1414-
key: meta_type::<u8>(),
1415-
value: meta_type::<u32>(),
1416-
},
1417-
default: vec![0],
1418-
docs: vec![],
1419-
},
1420-
StorageEntryMetadata {
1421-
name: "CounterForRenamedCountedMap",
1236+
name: "CounterForSomeCountedStorageMap",
14221237
modifier: StorageEntryModifier::Default,
14231238
ty: StorageEntryType::Plain(meta_type::<u32>()),
14241239
default: vec![0, 0, 0, 0],
14251240
docs: vec!["Counter for the related counted storage map"],
14261241
},
14271242
],
14281243
}),
1429-
calls: Some(meta_type::<pallet::Call<Runtime>>().into()),
1430-
event: Some(meta_type::<pallet::Event<Runtime>>().into()),
1431-
constants: vec![
1432-
PalletConstantMetadata {
1433-
name: "MyGetParam",
1434-
ty: meta_type::<u32>(),
1435-
value: vec![10, 0, 0, 0],
1436-
docs: vec![" Some comment", " Some comment"],
1437-
},
1438-
PalletConstantMetadata {
1439-
name: "MyGetParam2",
1440-
ty: meta_type::<u32>(),
1441-
value: vec![11, 0, 0, 0],
1442-
docs: vec![" Some comment", " Some comment"],
1443-
},
1444-
PalletConstantMetadata {
1445-
name: "MyGetParam3",
1446-
ty: meta_type::<u64>(),
1447-
value: vec![12, 0, 0, 0, 0, 0, 0, 0],
1448-
docs: vec![],
1449-
},
1450-
PalletConstantMetadata {
1451-
name: "some_extra",
1452-
ty: meta_type::<u64>(),
1453-
value: vec![100, 0, 0, 0, 0, 0, 0, 0],
1454-
docs: vec![" Some doc", " Some doc"],
1455-
},
1456-
PalletConstantMetadata {
1457-
name: "some_extra_extra",
1458-
ty: meta_type::<u64>(),
1459-
value: vec![0, 0, 0, 0, 0, 0, 0, 0],
1460-
docs: vec![" Some doc"],
1461-
},
1462-
],
1463-
error: Some(PalletErrorMetadata { ty: meta_type::<pallet::Error<Runtime>>() }),
1464-
},
1465-
PalletMetadata {
1466-
index: 2,
1467-
name: "Example2",
1468-
storage: Some(PalletStorageMetadata {
1469-
prefix: "Example2",
1470-
entries: vec![StorageEntryMetadata {
1471-
name: "SomeValue",
1472-
modifier: StorageEntryModifier::Optional,
1473-
ty: StorageEntryType::Plain(meta_type::<Vec<u32>>()),
1474-
default: vec![0],
1475-
docs: vec![],
1476-
}],
1477-
}),
14781244
calls: Some(meta_type::<pallet2::Call<Runtime>>().into()),
14791245
event: Some(PalletEventMetadata { ty: meta_type::<pallet2::Event>() }),
14801246
constants: vec![],
@@ -1504,7 +1270,7 @@ fn metadata() {
15041270
_ => panic!("metadata has been bumped, test needs to be updated"),
15051271
};
15061272

1507-
pretty_assertions::assert_eq!(actual_metadata.pallets[1], expected_metadata.pallets[1]);
1273+
pretty_assertions::assert_eq!(actual_metadata.pallets, expected_metadata.pallets);
15081274
}
15091275

15101276
#[test]

0 commit comments

Comments
 (0)