diff --git a/core/src/blocks/extrinsics.rs b/core/src/blocks/extrinsics.rs index c325ab54ca..d58af73483 100644 --- a/core/src/blocks/extrinsics.rs +++ b/core/src/blocks/extrinsics.rs @@ -279,7 +279,7 @@ where } /// Fetch the metadata for this extrinsic. - pub fn extrinsic_metadata(&self) -> Result { + pub fn extrinsic_metadata(&self) -> Result, Error> { let pallet = self.metadata.pallet_by_index_err(self.pallet_index())?; let variant = pallet .call_variant_by_index(self.variant_index()) diff --git a/core/src/events.rs b/core/src/events.rs index 874bc39b78..1d9d364703 100644 --- a/core/src/events.rs +++ b/core/src/events.rs @@ -339,7 +339,7 @@ impl EventDetails { } /// Fetch details from the metadata for this event. - pub fn event_metadata(&self) -> EventMetadataDetails { + pub fn event_metadata(&self) -> EventMetadataDetails<'_> { let pallet = self .metadata .pallet_by_index(self.pallet_index()) diff --git a/core/src/metadata/metadata_type.rs b/core/src/metadata/metadata_type.rs index a4e62f8239..4fe325a035 100644 --- a/core/src/metadata/metadata_type.rs +++ b/core/src/metadata/metadata_type.rs @@ -25,7 +25,7 @@ impl Metadata { pub fn pallet_by_name_err( &self, name: &str, - ) -> Result { + ) -> Result, MetadataError> { self.pallet_by_name(name) .ok_or_else(|| MetadataError::PalletNameNotFound(name.to_owned())) } @@ -34,7 +34,7 @@ impl Metadata { pub fn pallet_by_index_err( &self, index: u8, - ) -> Result { + ) -> Result, MetadataError> { self.pallet_by_index(index) .ok_or(MetadataError::PalletIndexNotFound(index)) } @@ -43,7 +43,7 @@ impl Metadata { pub fn runtime_api_trait_by_name_err( &self, name: &str, - ) -> Result { + ) -> Result, MetadataError> { self.runtime_api_trait_by_name(name) .ok_or_else(|| MetadataError::RuntimeTraitNotFound(name.to_owned())) } @@ -52,7 +52,7 @@ impl Metadata { pub fn custom_value_by_name_err( &self, name: &str, - ) -> Result { + ) -> Result, MetadataError> { self.custom() .get(name) .ok_or_else(|| MetadataError::CustomValueNameNotFound(name.to_owned())) diff --git a/lightclient/src/platform/wasm_platform.rs b/lightclient/src/platform/wasm_platform.rs index ade56ecd21..7a4b1bb1d9 100644 --- a/lightclient/src/platform/wasm_platform.rs +++ b/lightclient/src/platform/wasm_platform.rs @@ -72,17 +72,17 @@ impl PlatformRef for SubxtPlatform { fn spawn_task( &self, - _task_name: std::borrow::Cow, + _task_name: std::borrow::Cow<'_, str>, task: impl future::Future + Send + 'static, ) { wasm_bindgen_futures::spawn_local(task); } - fn client_name(&self) -> std::borrow::Cow { + fn client_name(&self) -> std::borrow::Cow<'_, str> { "subxt-light-client".into() } - fn client_version(&self) -> std::borrow::Cow { + fn client_version(&self) -> std::borrow::Cow<'_, str> { env!("CARGO_PKG_VERSION").into() } diff --git a/metadata/src/lib.rs b/metadata/src/lib.rs index e96f9ebf63..f680b36883 100644 --- a/metadata/src/lib.rs +++ b/metadata/src/lib.rs @@ -240,7 +240,7 @@ impl Metadata { } /// Obtain a unique hash representing this metadata or specific parts of it. - pub fn hasher(&self) -> MetadataHasher { + pub fn hasher(&self) -> MetadataHasher<'_> { MetadataHasher::new(self) } diff --git a/subxt/src/blocks/extrinsic_types.rs b/subxt/src/blocks/extrinsic_types.rs index 3b74615b56..4ba491a7ba 100644 --- a/subxt/src/blocks/extrinsic_types.rs +++ b/subxt/src/blocks/extrinsic_types.rs @@ -223,7 +223,7 @@ where } /// See [`subxt_core::blocks::ExtrinsicDetails::extrinsic_metadata()`]. - pub fn extrinsic_metadata(&self) -> Result { + pub fn extrinsic_metadata(&self) -> Result, Error> { self.inner.extrinsic_metadata().map_err(Into::into) } diff --git a/subxt/src/error/dispatch_error.rs b/subxt/src/error/dispatch_error.rs index 803f8f5939..0d307e7f44 100644 --- a/subxt/src/error/dispatch_error.rs +++ b/subxt/src/error/dispatch_error.rs @@ -169,7 +169,7 @@ impl std::fmt::Display for ModuleError { impl ModuleError { /// Return more details about this error. - pub fn details(&self) -> Result { + pub fn details(&self) -> Result, MetadataError> { let pallet = self.metadata.pallet_by_index_err(self.pallet_index())?; let variant = pallet .error_variant_by_index(self.error_index()) diff --git a/subxt/src/events/events_type.rs b/subxt/src/events/events_type.rs index 13cafe3036..b3bc52c094 100644 --- a/subxt/src/events/events_type.rs +++ b/subxt/src/events/events_type.rs @@ -118,7 +118,7 @@ impl EventDetails { } /// Fetch details from the metadata for this event. - pub fn event_metadata(&self) -> EventMetadataDetails { + pub fn event_metadata(&self) -> EventMetadataDetails<'_> { self.inner.event_metadata() }