pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 20:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Deps] Bump scale-info to match cumulus and polkadot (#13873)

Browse Source 
* [Deps] Bump scale-info to match cumulus and polkadot

* fix Cargo.lock

* fix identity

* more fixes

* fix

* fixes

* more fixes
This commit is contained in:
Roman Useinov
2023-04-12 14:14:06 +02:00
committed by GitHub
parent 4253ecbc62
commit 376a288fb6
108 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/test/tests/pallet.rs
+3 -3
View File
@@ -1616,9 +1616,9 @@ fn metadata() {
},
];
let empty_doc = pallets[0].event.as_ref().unwrap().ty.type_info().docs().is_empty() &&
pallets[0].error.as_ref().unwrap().ty.type_info().docs().is_empty() &&
pallets[0].calls.as_ref().unwrap().ty.type_info().docs().is_empty();
let empty_doc = pallets[0].event.as_ref().unwrap().ty.type_info().docs.is_empty() &&
pallets[0].error.as_ref().unwrap().ty.type_info().docs.is_empty() &&
pallets[0].calls.as_ref().unwrap().ty.type_info().docs.is_empty();
if cfg!(feature = "no-metadata-docs") {
assert!(empty_doc)
substrate/frame/support/test/tests/pallet_compatibility.rs
+18 -18
View File
@@ -295,14 +295,14 @@ mod test {
};
let assert_meta_types = |ty_id1, ty_id2| {
let ty1 = types.resolve(ty_id1).map(|ty| ty.type_def());
let ty2 = types.resolve(ty_id2).map(|ty| ty.type_def());
let ty1 = types.resolve(ty_id1).map(|ty| ty.type_def.clone());
let ty2 = types.resolve(ty_id2).map(|ty| ty.type_def.clone());
pretty_assertions::assert_eq!(ty1, ty2);
};
let get_enum_variants = |ty_id| match types.resolve(ty_id).map(|ty| ty.type_def()) {
let get_enum_variants = |ty_id| match types.resolve(ty_id).map(|ty| ty.type_def.clone()) {
Some(ty) => match ty {
scale_info::TypeDef::Variant(var) => var.variants(),
scale_info::TypeDef::Variant(var) => var.variants,
_ => panic!("Expected variant type"),
},
_ => panic!("No type found"),
@@ -314,12 +314,12 @@ mod test {
for i in 0..vs1.len() {
let v1 = &vs2[i];
let v2 = &vs2[i];
assert_eq!(v1.fields().len(), v2.fields().len());
for f in 0..v1.fields().len() {
let f1 = &v1.fields()[f];
let f2 = &v2.fields()[f];
pretty_assertions::assert_eq!(f1.name(), f2.name());
pretty_assertions::assert_eq!(f1.ty(), f2.ty());
assert_eq!(v1.fields.len(), v2.fields.len());
for f in 0..v1.fields.len() {
let f1 = &v1.fields[f];
let f2 = &v2.fields[f];
pretty_assertions::assert_eq!(f1.name, f2.name);
pretty_assertions::assert_eq!(f1.ty, f2.ty);
}
}
};
@@ -328,21 +328,21 @@ mod test {
let calls1 = pallets[1].calls.as_ref().unwrap();
let calls2 = pallets[2].calls.as_ref().unwrap();
assert_meta_types(calls1.ty.id(), calls2.ty.id());
assert_meta_types(calls1.ty.id, calls2.ty.id);
// event: check variants and fields but ignore the type name which will be different
let event1_variants = get_enum_variants(pallets[1].event.as_ref().unwrap().ty.id());
let event2_variants = get_enum_variants(pallets[2].event.as_ref().unwrap().ty.id());
assert_enum_variants(event1_variants, event2_variants);
let event1_variants = get_enum_variants(pallets[1].event.as_ref().unwrap().ty.id);
let event2_variants = get_enum_variants(pallets[2].event.as_ref().unwrap().ty.id);
assert_enum_variants(&event1_variants, &event2_variants);
let err1 = get_enum_variants(pallets[1].error.as_ref().unwrap().ty.id())
let err1 = get_enum_variants(pallets[1].error.as_ref().unwrap().ty.id)
.iter()
.filter(|v| v.name() == "__Ignore")
.filter(|v| v.name == "__Ignore")
.cloned()
.collect::<Vec<_>>();
let err2 = get_enum_variants(pallets[2].error.as_ref().unwrap().ty.id())
let err2 = get_enum_variants(pallets[2].error.as_ref().unwrap().ty.id)
.iter()
.filter(|v| v.name() == "__Ignore")
.filter(|v| v.name == "__Ignore")
.cloned()
.collect::<Vec<_>>();
assert_enum_variants(&err1, &err2);
substrate/frame/support/test/tests/pallet_compatibility_instance.rs
+18 -18
View File
@@ -298,9 +298,9 @@ mod test {
_ => unreachable!(),
};
let get_enum_variants = |ty_id| match types.resolve(ty_id).map(|ty| ty.type_def()) {
let get_enum_variants = |ty_id| match types.resolve(ty_id).map(|ty| ty.type_def.clone()) {
Some(ty) => match ty {
scale_info::TypeDef::Variant(var) => var.variants(),
scale_info::TypeDef::Variant(var) => var.variants,
_ => panic!("Expected variant type"),
},
_ => panic!("No type found"),
@@ -312,12 +312,12 @@ mod test {
for i in 0..vs1.len() {
let v1 = &vs2[i];
let v2 = &vs2[i];
assert_eq!(v1.fields().len(), v2.fields().len());
for f in 0..v1.fields().len() {
let f1 = &v1.fields()[f];
let f2 = &v2.fields()[f];
pretty_assertions::assert_eq!(f1.name(), f2.name());
pretty_assertions::assert_eq!(f1.ty(), f2.ty());
assert_eq!(v1.fields.len(), v2.fields.len());
for f in 0..v1.fields.len() {
let f1 = &v1.fields[f];
let f2 = &v2.fields[f];
pretty_assertions::assert_eq!(f1.name, f2.name);
pretty_assertions::assert_eq!(f1.ty, f2.ty);
}
}
};
@@ -325,23 +325,23 @@ mod test {
for i in vec![1, 3, 5].into_iter() {
pretty_assertions::assert_eq!(pallets[i].storage, pallets[i + 1].storage);
let call1_variants = get_enum_variants(pallets[i].calls.as_ref().unwrap().ty.id());
let call2_variants = get_enum_variants(pallets[i + 1].calls.as_ref().unwrap().ty.id());
assert_enum_variants(call1_variants, call2_variants);
let call1_variants = get_enum_variants(pallets[i].calls.as_ref().unwrap().ty.id);
let call2_variants = get_enum_variants(pallets[i + 1].calls.as_ref().unwrap().ty.id);
assert_enum_variants(&call1_variants, &call2_variants);
// event: check variants and fields but ignore the type name which will be different
let event1_variants = get_enum_variants(pallets[i].event.as_ref().unwrap().ty.id());
let event2_variants = get_enum_variants(pallets[i + 1].event.as_ref().unwrap().ty.id());
assert_enum_variants(event1_variants, event2_variants);
let event1_variants = get_enum_variants(pallets[i].event.as_ref().unwrap().ty.id);
let event2_variants = get_enum_variants(pallets[i + 1].event.as_ref().unwrap().ty.id);
assert_enum_variants(&event1_variants, &event2_variants);
let err1 = get_enum_variants(pallets[i].error.as_ref().unwrap().ty.id())
let err1 = get_enum_variants(pallets[i].error.as_ref().unwrap().ty.id)
.iter()
.filter(|v| v.name() == "__Ignore")
.filter(|v| v.name == "__Ignore")
.cloned()
.collect::<Vec<_>>();
let err2 = get_enum_variants(pallets[i + 1].error.as_ref().unwrap().ty.id())
let err2 = get_enum_variants(pallets[i + 1].error.as_ref().unwrap().ty.id)
.iter()
.filter(|v| v.name() == "__Ignore")
.filter(|v| v.name == "__Ignore")
.cloned()
.collect::<Vec<_>>();
assert_enum_variants(&err1, &err2);