Skip to content

Commit dd44ada

Browse files
committed
First pass converting historic metadatas to our subxt::Metadata type
1 parent dac487e commit dd44ada

File tree

14 files changed

+913
-26
lines changed

14 files changed

+913
-26
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,6 @@ opt-level = 2
192192
opt-level = 2
193193
[profile.test.package.smoldot]
194194
opt-level = 2
195+
196+
[patch.crates-io]
197+
frame-decode = { path = "../frame-decode" }

core/src/blocks/extrinsics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ mod tests {
494494
let metadata = metadata();
495495

496496
// Except our metadata to contain the registered types.
497-
let pallet = metadata.pallet_by_index(0).expect("pallet exists");
497+
let pallet = metadata.pallet_by_call_index(0).expect("pallet exists");
498498
let extrinsic = pallet
499499
.call_variant_by_index(2)
500500
.expect("metadata contains the RuntimeCall enum with this pallet");

core/src/events.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ impl<T: Config> EventDetails<T> {
262262

263263
// Get metadata for the event:
264264
let event_pallet = metadata
265-
.pallet_by_index(pallet_index)
265+
.pallet_by_event_index(pallet_index)
266266
.ok_or_else(|| EventsError::CannotFindPalletWithIndex(pallet_index))?;
267267
let event_variant = event_pallet
268268
.event_variant_by_index(variant_index)
@@ -359,7 +359,7 @@ impl<T: Config> EventDetails<T> {
359359
pub fn event_metadata(&self) -> EventMetadataDetails<'_> {
360360
let pallet = self
361361
.metadata
362-
.pallet_by_index(self.pallet_index())
362+
.pallet_by_event_index(self.pallet_index())
363363
.expect("event pallet to be found; we did this already during decoding");
364364
let variant = pallet
365365
.event_variant_by_index(self.variant_index())

core/src/tx/payload.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl<CallData: EncodeAsFields> Payload for DefaultPayload<CallData> {
182182
call_name: self.call_name.to_string(),
183183
})?;
184184

185-
let pallet_index = pallet.index();
185+
let pallet_index = pallet.call_index();
186186
let call_index = call.index;
187187

188188
pallet_index.encode_to(out);

metadata/Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ homepage.workspace = true
1414
description = "Command line utilities for checking metadata compatibility between nodes."
1515

1616
[features]
17-
default = ["std"]
17+
default = ["std", "legacy"]
1818
std = ["scale-info/std", "frame-metadata/std"]
1919

20+
# Enable decoding of legacy metadata, too.
21+
legacy = ["dep:scale-info-legacy", "dep:scale-type-resolver"]
22+
2023
[dependencies]
2124
scale-info = { workspace = true, default-features = false }
25+
scale-info-legacy = { workspace = true, optional = true }
26+
scale-type-resolver = { workspace = true, optional = true }
2227
frame-decode = { workspace = true }
2328
frame-metadata = { workspace = true, default-features = false, features = ["current", "decode"] }
2429
codec = { package = "parity-scale-codec", workspace = true, default-features = false, features = ["derive"] }

0 commit comments

Comments
 (0)