From ee2bf5f3d923880fa24fa347180da79891a9e9a9 Mon Sep 17 00:00:00 2001 From: James Wilson Date: Thu, 2 Oct 2025 15:06:07 +0100 Subject: [PATCH] Small fixes in subxt-core and remove metadata mod --- core/src/client.rs | 2 +- core/src/custom_values/address.rs | 2 +- core/src/custom_values/mod.rs | 9 +++++---- core/src/events.rs | 2 +- core/src/lib.rs | 7 +------ core/src/runtime_api/mod.rs | 2 +- core/src/tx/mod.rs | 2 +- core/src/tx/payload.rs | 4 ++-- core/src/view_functions/mod.rs | 2 +- subxt/src/backend/mod.rs | 2 +- subxt/src/error/mod.rs | 2 +- 11 files changed, 16 insertions(+), 20 deletions(-) diff --git a/core/src/client.rs b/core/src/client.rs index e7396c883a..03ae8bf18e 100644 --- a/core/src/client.rs +++ b/core/src/client.rs @@ -6,7 +6,7 @@ use crate::{ config::{Config, HashFor}, - metadata::Metadata, + Metadata, }; use derive_where::derive_where; diff --git a/core/src/custom_values/address.rs b/core/src/custom_values/address.rs index e5f834adae..5fb7bb2db5 100644 --- a/core/src/custom_values/address.rs +++ b/core/src/custom_values/address.rs @@ -85,7 +85,7 @@ impl Address for StaticAddress(address: &Addr, metadata: &Metadata) -> /// Access a custom value by the address it is registered under. This can be just a [str] to get back a dynamic value, /// or a static address from the generated static interface to get a value of a static type returned. -pub fn get + ?Sized>( +pub fn get + ?Sized>( address: &Addr, metadata: &Metadata, ) -> Result { @@ -163,8 +163,9 @@ mod tests { let metadata = mock_metadata(); assert!(custom_values::get("Invalid Address", &metadata).is_err()); - let person_decoded_value_thunk = custom_values::get("Mr. Robot", &metadata).unwrap(); - let person: Person = person_decoded_value_thunk.as_type().unwrap(); + + let person_addr = custom_values::address::dynamic::("Mr. Robot"); + let person = custom_values::get(&person_addr, &metadata).unwrap(); assert_eq!( person, Person { diff --git a/core/src/events.rs b/core/src/events.rs index 37081cc3a4..0c51313f4a 100644 --- a/core/src/events.rs +++ b/core/src/events.rs @@ -653,7 +653,7 @@ mod tests { expected: TestRawEventDetails, ) { let actual_fields_no_context: Vec<_> = actual - .field_values() + .decode_fields_as::>() .expect("can decode field values (2)") .into_values() .map(|value| value.remove_context()) diff --git a/core/src/lib.rs b/core/src/lib.rs index 4cac3a2d21..14b0cb42ad 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -39,7 +39,7 @@ pub mod view_functions; pub use config::Config; pub use error::Error; -pub use metadata::Metadata; +pub use subxt_metadata::Metadata; /// Re-exports of some of the key external crates. pub mod ext { @@ -48,8 +48,3 @@ pub mod ext { pub use scale_encode; pub use scale_value; } - -/// Re-exports the [`subxt_metadata::Metadata`] type. -pub mod metadata { - pub use subxt_metadata::Metadata; -} \ No newline at end of file diff --git a/core/src/runtime_api/mod.rs b/core/src/runtime_api/mod.rs index 0fb67354a9..7306669770 100644 --- a/core/src/runtime_api/mod.rs +++ b/core/src/runtime_api/mod.rs @@ -44,7 +44,7 @@ pub mod payload; use crate::error::RuntimeApiError; -use crate::metadata::Metadata; +use crate::Metadata; use alloc::format; use alloc::string::String; use alloc::vec::Vec; diff --git a/core/src/tx/mod.rs b/core/src/tx/mod.rs index f78949efbb..00fe26e8cd 100644 --- a/core/src/tx/mod.rs +++ b/core/src/tx/mod.rs @@ -61,7 +61,7 @@ pub mod signer; use crate::config::{Config, ExtrinsicParams, ExtrinsicParamsEncoder, HashFor, Hasher}; use crate::error::ExtrinsicError; -use crate::metadata::Metadata; +use crate::Metadata; use crate::utils::Encoded; use alloc::borrow::Cow; use alloc::vec::Vec; diff --git a/core/src/tx/payload.rs b/core/src/tx/payload.rs index 16a84bb1a4..8c1918cf66 100644 --- a/core/src/tx/payload.rs +++ b/core/src/tx/payload.rs @@ -6,7 +6,7 @@ //! transactions that can be submitted. use crate::error::ExtrinsicError; -use crate::metadata::Metadata; +use crate::Metadata; use alloc::borrow::Cow; use alloc::boxed::Box; use alloc::string::String; @@ -212,7 +212,7 @@ pub fn dynamic( #[cfg(test)] mod tests { use super::*; - use crate::metadata::Metadata; + use crate::Metadata; use codec::Decode; use scale_value::Composite; diff --git a/core/src/view_functions/mod.rs b/core/src/view_functions/mod.rs index d740bfcaeb..282723366e 100644 --- a/core/src/view_functions/mod.rs +++ b/core/src/view_functions/mod.rs @@ -8,7 +8,7 @@ pub mod payload; use crate::error::ViewFunctionError; -use crate::metadata::Metadata; +use crate::Metadata; use alloc::vec::Vec; use payload::Payload; use scale_decode::IntoVisitor; diff --git a/subxt/src/backend/mod.rs b/subxt/src/backend/mod.rs index 72549fc35c..052c075817 100644 --- a/subxt/src/backend/mod.rs +++ b/subxt/src/backend/mod.rs @@ -12,7 +12,7 @@ pub mod utils; use crate::config::{Config, HashFor}; use crate::error::Error; -use crate::metadata::Metadata; +use crate::Metadata; use async_trait::async_trait; use codec::{Decode, Encode}; use futures::{Stream, StreamExt}; diff --git a/subxt/src/error/mod.rs b/subxt/src/error/mod.rs index d40d75ed1f..a1904f0f57 100644 --- a/subxt/src/error/mod.rs +++ b/subxt/src/error/mod.rs @@ -18,7 +18,7 @@ pub use dispatch_error::{ }; // Re-expose the errors we use from other crates here: -pub use crate::metadata::Metadata; +pub use crate::Metadata; pub use scale_decode::Error as DecodeError; pub use scale_encode::Error as EncodeError; pub use subxt_core::error::{ExtrinsicError, MetadataError, StorageError};