mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-22 04:28:00 +00:00
Rebrand subxt to pezkuwi-subxt with pezsp_runtime support
- Renamed all crate names from subxt-* to pezkuwi-subxt-* - Updated codegen to use pezsp_runtime, pezsp_core, pezframe_support instead of sp_runtime, sp_core, frame_support - Replaced all internal references from subxt_* to pezkuwi_subxt_* - Added local path dependencies to Pezkuwi SDK crates - Updated workspace configuration for edition 2024
This commit is contained in:
@@ -7,7 +7,7 @@ use scale_info::{
|
||||
build::{Fields, Variants},
|
||||
};
|
||||
|
||||
/// See the `ModuleErrorType` in `subxt_codegen` for more info on the different DispatchError
|
||||
/// See the `ModuleErrorType` in `pezkuwi_subxt_codegen` for more info on the different DispatchError
|
||||
/// types that we've encountered. We need the path to match `sp_runtime::DispatchError`, otherwise
|
||||
/// we could just implement roughly the correct types and derive TypeInfo on them.
|
||||
///
|
||||
|
||||
@@ -36,13 +36,13 @@ regex = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
scale-info = { workspace = true, features = ["bit-vec"] }
|
||||
scale-value = { workspace = true }
|
||||
sp-core = { workspace = true, features = ["std"] }
|
||||
pezsp-core = { workspace = true, features = ["std"] }
|
||||
syn = { workspace = true }
|
||||
subxt = { workspace = true, features = ["unstable-metadata", "native", "jsonrpsee", "reconnecting-rpc-client"] }
|
||||
subxt-signer = { workspace = true, features = ["default"] }
|
||||
subxt-codegen = { workspace = true }
|
||||
subxt-metadata = { workspace = true }
|
||||
subxt-rpcs = { workspace = true }
|
||||
pezkuwi-subxt = { workspace = true, features = ["unstable-metadata", "native", "jsonrpsee", "reconnecting-rpc-client"] }
|
||||
pezkuwi-subxt-signer = { workspace = true, features = ["default"] }
|
||||
pezkuwi-subxt-codegen = { workspace = true }
|
||||
pezkuwi-subxt-metadata = { workspace = true }
|
||||
pezkuwi-subxt-rpcs = { workspace = true }
|
||||
test-runtime = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
|
||||
@@ -19,7 +19,7 @@ use subxt::{
|
||||
};
|
||||
|
||||
#[cfg(fullclient)]
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
#[cfg(fullclient)]
|
||||
#[subxt_test]
|
||||
|
||||
@@ -17,11 +17,11 @@ use subxt::{
|
||||
config::{Config, Hasher},
|
||||
utils::AccountId32,
|
||||
};
|
||||
use subxt_rpcs::methods::chain_head::{
|
||||
use pezkuwi_subxt_rpcs::methods::chain_head::{
|
||||
ArchiveStorageEventItem, Bytes, StorageQuery, StorageQueryType,
|
||||
};
|
||||
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
async fn fetch_finalized_blocks<T: Config>(
|
||||
ctx: &TestNodeProcess<T>,
|
||||
@@ -72,7 +72,7 @@ async fn archive_v1_call() {
|
||||
let mut blocks = fetch_finalized_blocks(&ctx, 3).await;
|
||||
|
||||
while let Some(block) = blocks.next().await {
|
||||
let subxt_metadata_versions = block
|
||||
let pezkuwi_subxt_metadata_versions = block
|
||||
.runtime_api()
|
||||
.await
|
||||
.call(node_runtime::apis().metadata().metadata_versions())
|
||||
@@ -87,7 +87,7 @@ async fn archive_v1_call() {
|
||||
.unwrap()
|
||||
.0;
|
||||
|
||||
assert_eq!(subxt_metadata_versions, archive_metadata_versions);
|
||||
assert_eq!(pezkuwi_subxt_metadata_versions, archive_metadata_versions);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,12 +16,12 @@ use subxt::{
|
||||
config::Hasher,
|
||||
utils::{AccountId32, MultiAddress},
|
||||
};
|
||||
use subxt_rpcs::methods::chain_head::{
|
||||
use pezkuwi_subxt_rpcs::methods::chain_head::{
|
||||
FollowEvent, Initialized, MethodResponse, RuntimeEvent, RuntimeVersionEvent, StorageQuery,
|
||||
StorageQueryType,
|
||||
};
|
||||
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
#[subxt_test]
|
||||
async fn chainhead_v1_follow() {
|
||||
|
||||
@@ -16,7 +16,7 @@ use subxt::{
|
||||
error::{DispatchError, TransactionEventsError, TransactionFinalizedSuccessError},
|
||||
tx::{TransactionInvalid, ValidationResult},
|
||||
};
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
#[cfg(fullclient)]
|
||||
mod archive_rpcs;
|
||||
@@ -126,7 +126,7 @@ async fn transaction_validation() {
|
||||
#[subxt_test]
|
||||
async fn validation_fails() {
|
||||
use std::str::FromStr;
|
||||
use subxt_signer::{SecretUri, sr25519::Keypair};
|
||||
use pezkuwi_subxt_signer::{SecretUri, sr25519::Keypair};
|
||||
|
||||
let ctx = test_context().await;
|
||||
let api = ctx.client();
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
use codec::Decode;
|
||||
use regex::Regex;
|
||||
use subxt_codegen::{CodegenBuilder, syn};
|
||||
use subxt_metadata::Metadata;
|
||||
use pezkuwi_subxt_codegen::{CodegenBuilder, syn};
|
||||
use pezkuwi_subxt_metadata::Metadata;
|
||||
|
||||
fn load_test_metadata() -> Metadata {
|
||||
let bytes = test_runtime::METADATA;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -12,7 +12,7 @@ use subxt::{
|
||||
ext::scale_decode::DecodeAsType,
|
||||
utils::{AccountId32, MultiAddress},
|
||||
};
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
#[subxt_test]
|
||||
async fn tx_basic_transfer() -> Result<(), subxt::Error> {
|
||||
@@ -140,7 +140,7 @@ async fn tx_dynamic_transfer() -> Result<(), subxt::Error> {
|
||||
.expect("Failed to decode event fields");
|
||||
|
||||
#[derive(DecodeAsType, Debug, PartialEq)]
|
||||
#[decode_as_type(crate_path = "::subxt::ext::scale_decode")]
|
||||
#[decode_as_type(crate_path = "::pezkuwi_subxt::ext::scale_decode")]
|
||||
struct DecodedTransferEvent {
|
||||
from: AccountId32,
|
||||
to: AccountId32,
|
||||
|
||||
@@ -19,7 +19,7 @@ use subxt::{
|
||||
tx::TxProgress,
|
||||
utils::MultiAddress,
|
||||
};
|
||||
use subxt_signer::sr25519::{self, dev};
|
||||
use pezkuwi_subxt_signer::sr25519::{self, dev};
|
||||
|
||||
struct ContractsTestContext {
|
||||
cxt: TestContext,
|
||||
|
||||
@@ -16,7 +16,7 @@ use crate::{
|
||||
use subxt::error::{
|
||||
DispatchError, Error, TransactionEventsError, TransactionFinalizedSuccessError,
|
||||
};
|
||||
use subxt_signer::{
|
||||
use pezkuwi_subxt_signer::{
|
||||
SecretUri,
|
||||
sr25519::{self, dev},
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@ use crate::{
|
||||
},
|
||||
subxt_test, test_context,
|
||||
};
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
type Call = runtime_types::kitchensink_runtime::RuntimeCall;
|
||||
type BalancesCall = runtime_types::pallet_balances::pallet::Call;
|
||||
|
||||
@@ -6,7 +6,7 @@ use crate::{
|
||||
node_runtime::{self, system},
|
||||
subxt_test, test_context,
|
||||
};
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
#[subxt_test]
|
||||
async fn storage_account() -> Result<(), subxt::Error> {
|
||||
|
||||
@@ -49,7 +49,7 @@ async fn metadata_to_api(metadata: Metadata, ctx: &TestContext) -> OfflineClient
|
||||
}
|
||||
|
||||
fn v15_to_metadata(v15: RuntimeMetadataV15) -> Metadata {
|
||||
let subxt_md: subxt_metadata::Metadata = v15.try_into().unwrap();
|
||||
let subxt_md: pezkuwi_subxt_metadata::Metadata = v15.try_into().unwrap();
|
||||
subxt_md
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
use crate::{node_runtime, subxt_test, test_context};
|
||||
use codec::{Decode, Encode};
|
||||
use subxt::utils::AccountId32;
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
#[subxt_test]
|
||||
async fn account_nonce() -> Result<(), subxt::Error> {
|
||||
|
||||
@@ -8,7 +8,7 @@ use futures::StreamExt;
|
||||
#[cfg(fullclient)]
|
||||
use subxt::utils::AccountId32;
|
||||
#[cfg(fullclient)]
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
#[subxt_test]
|
||||
async fn storage_plain_lookup() -> Result<(), subxt::Error> {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
use crate::utils::node_runtime;
|
||||
use crate::{subxt_test, test_context};
|
||||
use frame_decode::extrinsics::ExtrinsicType;
|
||||
use subxt_signer::sr25519::dev;
|
||||
use pezkuwi_subxt_signer::sr25519::dev;
|
||||
|
||||
// TODO: When VerifySignature exists on the substrate kitchensink runtime,
|
||||
// let's try actuallty submitting v4 and v5 signed extrinsics to verify that
|
||||
|
||||
@@ -34,7 +34,7 @@ use subxt::backend::chain_head::ChainHeadBackend;
|
||||
use subxt::backend::rpc::RpcClient;
|
||||
use subxt::dynamic::Value;
|
||||
use subxt::{client::OnlineClient, config::PolkadotConfig, lightclient::LightClient};
|
||||
use subxt_metadata::Metadata;
|
||||
use pezkuwi_subxt_metadata::Metadata;
|
||||
|
||||
type Client = OnlineClient<PolkadotConfig>;
|
||||
|
||||
|
||||
@@ -16,6 +16,6 @@ pub use wait_for_blocks::*;
|
||||
/// This must cause the test to panic.
|
||||
#[subxt_test(timeout = 1)]
|
||||
#[should_panic]
|
||||
async fn test_subxt_macro() {
|
||||
async fn test_pezkuwi_subxt_macro() {
|
||||
tokio::time::sleep(std::time::Duration::from_secs(5)).await;
|
||||
}
|
||||
|
||||
@@ -35,20 +35,20 @@ fn compile_test() {
|
||||
// Subxt Metadata compiles:
|
||||
use codec::Decode;
|
||||
let bytes: alloc::vec::Vec<u8> = alloc::vec![0, 1, 2, 3, 4];
|
||||
subxt_metadata::Metadata::decode(&mut &bytes[..]).expect_err("invalid byte sequence");
|
||||
pezkuwi_subxt_metadata::Metadata::decode(&mut &bytes[..]).expect_err("invalid byte sequence");
|
||||
|
||||
const METADATA: &[u8] = include_bytes!("../../../artifacts/polkadot_metadata_small.scale");
|
||||
subxt_metadata::Metadata::decode(&mut &METADATA[..]).expect("should be valid metadata");
|
||||
pezkuwi_subxt_metadata::Metadata::decode(&mut &METADATA[..]).expect("should be valid metadata");
|
||||
|
||||
// Subxt signer compiles (though nothing much works on this particular nostd target...):
|
||||
// Supported targets: <https://docs.rs/getrandom/latest/getrandom/#supported-targets>
|
||||
use core::str::FromStr;
|
||||
let _ = subxt_signer::SecretUri::from_str("//Alice/bar");
|
||||
let _ = pezkuwi_subxt_signer::SecretUri::from_str("//Alice/bar");
|
||||
|
||||
// Note: sr25519 needs randomness, but `thumbv7em-none-eabi` isn't supported by
|
||||
// `getrandom`, so we can't sign in nostd on this target.
|
||||
//
|
||||
// use subxt_signer::sr25519;
|
||||
// use pezkuwi_subxt_signer::sr25519;
|
||||
// let keypair = sr25519::dev::alice();
|
||||
// let message = b"Hello!";
|
||||
// let _signature = keypair.sign(message);
|
||||
@@ -57,18 +57,18 @@ fn compile_test() {
|
||||
// Note: `ecdsa` is also not compiling for the `thumbv7em-none-eabi` target owing to
|
||||
// an issue compiling `secp256k1-sys`.
|
||||
//
|
||||
// use subxt_signer::ecdsa;
|
||||
// use pezkuwi_subxt_signer::ecdsa;
|
||||
// let keypair = ecdsa::dev::alice();
|
||||
// let message = b"Hello!";
|
||||
// let _signature = keypair.sign(message);
|
||||
// let _public_key = keypair.public_key();
|
||||
|
||||
// Subxt Core compiles:
|
||||
let _era = subxt_core::utils::Era::Immortal;
|
||||
let _era = pezkuwi_subxt_core::utils::Era::Immortal;
|
||||
}
|
||||
|
||||
#[subxt_macro::subxt(
|
||||
#[pezkuwi_subxt_macro::subxt(
|
||||
runtime_metadata_path = "../../artifacts/polkadot_metadata_full.scale",
|
||||
crate = "::subxt_core"
|
||||
crate = "::pezkuwi_subxt_core"
|
||||
)]
|
||||
pub mod polkadot {}
|
||||
|
||||
@@ -5,7 +5,7 @@ edition = "2021"
|
||||
publish = false
|
||||
|
||||
[dependencies]
|
||||
subxt = { workspace = true, features = ["native"] }
|
||||
pezkuwi-subxt = { workspace = true, features = ["native"] }
|
||||
|
||||
[build-dependencies]
|
||||
substrate-runner = { workspace = true }
|
||||
|
||||
@@ -14,7 +14,7 @@ hex = { workspace = true }
|
||||
scale-info = { workspace = true, features = ["bit-vec"] }
|
||||
frame-metadata = { workspace = true }
|
||||
codec = { package = "parity-scale-codec", workspace = true, features = ["derive", "bit-vec"] }
|
||||
subxt = { workspace = true, features = ["native", "jsonrpsee", "runtime-wasm-path"] }
|
||||
subxt-metadata = { workspace = true }
|
||||
pezkuwi-subxt = { workspace = true, features = ["native", "jsonrpsee", "runtime-wasm-path"] }
|
||||
pezkuwi-subxt-metadata = { workspace = true }
|
||||
subxt-utils-stripmetadata = { workspace = true }
|
||||
generate-custom-metadata = { path = "../generate-custom-metadata" }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use codec::{Decode};
|
||||
use subxt::{config::substrate::H256, OfflineClient, PolkadotConfig};
|
||||
use subxt_metadata::Metadata;
|
||||
use pezkuwi_subxt_metadata::Metadata;
|
||||
|
||||
#[subxt::subxt(runtime_metadata_path = "../../../../artifacts/metadata_with_custom_values.scale", derive_for_all_types = "Eq, PartialEq")]
|
||||
pub mod node {}
|
||||
|
||||
@@ -84,7 +84,7 @@ pub mod node_runtime6 {}
|
||||
substitute_type(
|
||||
path = "sp_runtime::multiaddress::MultiAddress<A, B>",
|
||||
// Check that things can be wrapped in our Static type:
|
||||
with = "::subxt::utils::Static<crate::DoesntImplEncodeDecodeAsType>"
|
||||
with = "::pezkuwi_subxt::utils::Static<crate::DoesntImplEncodeDecodeAsType>"
|
||||
)
|
||||
)]
|
||||
pub mod node_runtime7 {}
|
||||
@@ -94,7 +94,7 @@ pub mod node_runtime7 {}
|
||||
substitute_type(
|
||||
path = "sp_runtime::multiaddress::MultiAddress<A, B>",
|
||||
// Recursive type param substitution should work too (swapping out nested A and B):
|
||||
with = "::subxt::utils::Static<crate::Second<A, B>>"
|
||||
with = "::pezkuwi_subxt::utils::Static<crate::Second<A, B>>"
|
||||
)
|
||||
)]
|
||||
pub mod node_runtime8 {}
|
||||
|
||||
@@ -18,7 +18,7 @@ mod utils;
|
||||
|
||||
use crate::utils::MetadataTestRunner;
|
||||
use frame_metadata::{RuntimeMetadata, RuntimeMetadataPrefixed};
|
||||
use subxt_utils_stripmetadata::StripMetadata;
|
||||
use pezkuwi_subxt_utils_stripmetadata::StripMetadata;
|
||||
|
||||
// Each of these tests leads to some rust code being compiled and
|
||||
// executed to test that compilation is successful (or errors in the
|
||||
|
||||
Reference in New Issue
Block a user