fix: resolve pezsp_runtime visibility issues across workspace
- Add direct pezsp-runtime dependency to crates requiring pezsp_runtime types - Update imports to use pezkuwi_sdk:: prefix for primitive crates - Fix subxt_client.rs substitute_type paths to match rebranded metadata - Update umbrella crate with additional feature exports - Fix pezstaging-node-cli, pez-minimal-template-node, teyrchain templates - Delete stale sqlx query cache files (require regeneration with running chain)
This commit is contained in:
@@ -46,21 +46,23 @@ use pezsc_statement_store::Store as StatementStore;
|
||||
use pezsc_telemetry::{Telemetry, TelemetryWorker};
|
||||
use pezsc_transaction_pool::TransactionPoolHandle;
|
||||
use pezsc_transaction_pool_api::OffchainTransactionPoolFactory;
|
||||
use pezsp_api::ProvideRuntimeApi;
|
||||
use pezsp_core::crypto::Pair;
|
||||
use pezkuwi_sdk::pezsp_api::ProvideRuntimeApi;
|
||||
use pezkuwi_sdk::pezsp_core::crypto::Pair;
|
||||
use pezsp_runtime::{generic, traits::Block as BlockT, SaturatedConversion};
|
||||
use std::{path::Path, sync::Arc};
|
||||
|
||||
/// Host functions required for kitchensink runtime and Bizinikiwi node.
|
||||
#[cfg(not(feature = "runtime-benchmarks"))]
|
||||
pub type HostFunctions =
|
||||
(pezsp_io::BizinikiwiHostFunctions, pezsp_statement_store::runtime_api::HostFunctions);
|
||||
pub type HostFunctions = (
|
||||
pezkuwi_sdk::pezsp_io::BizinikiwiHostFunctions,
|
||||
pezkuwi_sdk::pezsp_statement_store::runtime_api::HostFunctions,
|
||||
);
|
||||
|
||||
/// Host functions required for kitchensink runtime and Bizinikiwi node.
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
pub type HostFunctions = (
|
||||
pezsp_io::BizinikiwiHostFunctions,
|
||||
pezsp_statement_store::runtime_api::HostFunctions,
|
||||
pezkuwi_sdk::pezsp_io::BizinikiwiHostFunctions,
|
||||
pezkuwi_sdk::pezsp_statement_store::runtime_api::HostFunctions,
|
||||
pezframe_benchmarking::benchmarking::HostFunctions,
|
||||
);
|
||||
|
||||
@@ -273,9 +275,9 @@ pub fn new_partial(
|
||||
beefy_block_import,
|
||||
client.clone(),
|
||||
Arc::new(move |_, _| async move {
|
||||
let timestamp = pezsp_timestamp::InherentDataProvider::from_system_time();
|
||||
let timestamp = pezkuwi_sdk::pezsp_timestamp::InherentDataProvider::from_system_time();
|
||||
let slot =
|
||||
pezsp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
|
||||
pezkuwi_sdk::pezsp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
|
||||
*timestamp,
|
||||
slot_duration,
|
||||
);
|
||||
@@ -621,16 +623,16 @@ pub fn new_full_base<N: NetworkBackend<Block, <Block as BlockT>::Hash>>(
|
||||
create_inherent_data_providers: move |parent, ()| {
|
||||
let client_clone = client_clone.clone();
|
||||
async move {
|
||||
let timestamp = pezsp_timestamp::InherentDataProvider::from_system_time();
|
||||
let timestamp = pezkuwi_sdk::pezsp_timestamp::InherentDataProvider::from_system_time();
|
||||
|
||||
let slot =
|
||||
pezsp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
|
||||
pezkuwi_sdk::pezsp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
|
||||
*timestamp,
|
||||
slot_duration,
|
||||
);
|
||||
|
||||
let storage_proof =
|
||||
pezsp_transaction_storage_proof::registration::new_data_provider(
|
||||
pezkuwi_sdk::pezsp_transaction_storage_proof::registration::new_data_provider(
|
||||
&*client_clone,
|
||||
&parent,
|
||||
)?;
|
||||
@@ -729,7 +731,7 @@ pub fn new_full_base<N: NetworkBackend<Block, <Block as BlockT>::Hash>>(
|
||||
pezmmr_gadget::MmrGadget::start(
|
||||
client.clone(),
|
||||
backend.clone(),
|
||||
pezsp_mmr_primitives::INDEXING_PREFIX.to_vec(),
|
||||
pezkuwi_sdk::pezsp_mmr_primitives::INDEXING_PREFIX.to_vec(),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -877,7 +879,17 @@ mod tests {
|
||||
Address, BalancesCall, RuntimeCall, TxExtension,
|
||||
};
|
||||
use pez_node_primitives::{Block, DigestItem, Signature};
|
||||
use pezkuwi_sdk::{pezsc_transaction_pool_api::MaintainedTransactionPool, *};
|
||||
use pezkuwi_sdk::{
|
||||
pezsc_transaction_pool_api::MaintainedTransactionPool,
|
||||
pezsp_consensus::{BlockOrigin, Environment, Proposer},
|
||||
pezsp_consensus_babe,
|
||||
pezsp_core::crypto::Pair,
|
||||
pezsp_inherents::InherentDataProvider,
|
||||
pezsp_keystore::KeystorePtr,
|
||||
pezsp_timestamp,
|
||||
pezsp_tracing,
|
||||
*,
|
||||
};
|
||||
use pezsc_client_api::BlockBackend;
|
||||
use pezsc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
|
||||
use pezsc_consensus_babe::{BabeIntermediate, CompatibleDigestItem, INTERMEDIATE_KEY};
|
||||
@@ -885,18 +897,13 @@ mod tests {
|
||||
use pezsc_keystore::LocalKeystore;
|
||||
use pezsc_service_test::TestNetNode;
|
||||
use pezsc_transaction_pool_api::ChainEvent;
|
||||
use pezsp_consensus::{BlockOrigin, Environment, Proposer};
|
||||
use pezsp_core::crypto::Pair;
|
||||
use pezsp_inherents::InherentDataProvider;
|
||||
use pezsp_keyring::Sr25519Keyring;
|
||||
use pezsp_keystore::KeystorePtr;
|
||||
use pezsp_runtime::{
|
||||
generic::{self, Digest, Era, SignedPayload},
|
||||
key_types::BABE,
|
||||
traits::{Block as BlockT, Header as HeaderT, IdentifyAccount, Verify},
|
||||
RuntimeAppPublic,
|
||||
};
|
||||
use pezsp_timestamp;
|
||||
use std::sync::Arc;
|
||||
|
||||
type AccountPublic = <Signature as Verify>::Signer;
|
||||
|
||||
Reference in New Issue
Block a user