pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-20 05:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix error conversions in subxt

Browse Source
This commit is contained in:
Pavlo Khrystenko
2024-05-22 18:12:06 +02:00
parent 63e7fd467f
commit fd5ea91f40
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
subxt/src/error/dispatch_error.rs
+3 -1
View File
@@ -171,7 +171,9 @@ impl ModuleError {
let pallet = self.metadata.pallet_by_index_err(self.pallet_index())?; let pallet = self.metadata.pallet_by_index_err(self.pallet_index())?;
let variant = pallet let variant = pallet
.error_variant_by_index(self.error_index()) .error_variant_by_index(self.error_index())
.ok_or_else(|| MetadataError::VariantIndexNotFound(self.error_index()))?; .ok_or_else(|| MetadataError::VariantIndexNotFound {
variant_idx: self.error_index(),
})?;
Ok(ModuleErrorDetails { pallet, variant }) Ok(ModuleErrorDetails { pallet, variant })
} }
subxt/src/error/mod.rs
+9 -9
View File
@@ -85,13 +85,13 @@ pub enum Error {
impl From<CoreError> for Error { impl From<CoreError> for Error {
fn from(value: CoreError) -> Self { fn from(value: CoreError) -> Self {
match value { match value {
CoreError::Codec(e) => Error::Codec(e), CoreError::Codec { source: e } => Error::Codec(e.0),
CoreError::Metadata(e) => Error::Metadata(e), CoreError::Metadata { source: e } => Error::Metadata(e),
CoreError::StorageAddress(e) => Error::StorageAddress(e), CoreError::StorageAddress { source: e } => Error::StorageAddress(e),
CoreError::Decode(e) => Error::Decode(e), CoreError::Decode { source: e } => Error::Decode(e.0),
CoreError::Encode(e) => Error::Encode(e), CoreError::Encode { source: e } => Error::Encode(e.0),
CoreError::ExtrinsicParams(e) => Error::ExtrinsicParams(e), CoreError::ExtrinsicParams { source: e } => Error::ExtrinsicParams(e),
CoreError::Block(e) => Error::Block(e.into()), CoreError::Block { source: e } => Error::Block(e.into()),
} }
} }
} }
@@ -187,8 +187,8 @@ impl From<CoreBlockError> for BlockError {
fn from(value: CoreBlockError) -> Self { fn from(value: CoreBlockError) -> Self {
match value { match value {
CoreBlockError::MissingType => BlockError::MissingType, CoreBlockError::MissingType => BlockError::MissingType,
CoreBlockError::UnsupportedVersion(n) => BlockError::UnsupportedVersion(n), CoreBlockError::UnsupportedVersion { version: n } => BlockError::UnsupportedVersion(n),
CoreBlockError::DecodingError(e) => BlockError::DecodingError(e), CoreBlockError::DecodingError { source: e } => BlockError::DecodingError(e.0),
} }
} }
} }
subxt/src/storage/storage_type.rs
+3 -1
View File
@@ -268,7 +268,9 @@ where
self.client self.client
.metadata() .metadata()
.pallet_by_name(pallet_name.as_ref()) .pallet_by_name(pallet_name.as_ref())
.ok_or_else(|| MetadataError::PalletNameNotFound(pallet_name.as_ref().into()))?; .ok_or_else(|| MetadataError::PalletNameNotFound {
name: pallet_name.as_ref().into(),
})?;
// construct the storage key. This is done similarly in `frame_support::traits::metadata::StorageVersion::storage_key()`. // construct the storage key. This is done similarly in `frame_support::traits::metadata::StorageVersion::storage_key()`.
pub const STORAGE_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__STORAGE_VERSION__:"; pub const STORAGE_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__STORAGE_VERSION__:";