Skip to content

Commit ab2b31b

Browse files
kariykariy
committed
missing during merge
1 parent 94a7f24 commit ab2b31b

File tree

3 files changed

+35
-41
lines changed

3 files changed

+35
-41
lines changed

‎crates/cli/src/args.rs‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -790,17 +790,15 @@ async fn bootstrap_and_start_sidecars<P>(
790790
) -> Result<Option<crate::sidecar::SidecarProcesses>>
791791
where
792792
P: katana_provider::ProviderFactory + Clone,
793-
<P as katana_provider::ProviderFactory>::Provider:
794-
katana_core::backend::storage::ProviderRO,
795-
<P as katana_provider::ProviderFactory>::ProviderMut:
796-
katana_core::backend::storage::ProviderRW,
793+
<P as katana_provider::ProviderFactory>::Provider: katana_provider::ProviderRO,
794+
<P as katana_provider::ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
797795
{
798-
#[cfg(feature = "vrf")]
799-
use crate::sidecar::{VrfBootstrapConfig, VrfKeySource, VrfSidecarConfig};
800796
use crate::sidecar::{
801797
bootstrap_sidecars, start_sidecars, BootstrapConfig, PaymasterSidecarConfig,
802798
SidecarStartConfig,
803799
};
800+
#[cfg(feature = "vrf")]
801+
use crate::sidecar::{VrfBootstrapConfig, VrfKeySource, VrfSidecarConfig};
804802

805803
// If no sidecars need to be started, return None
806804
#[cfg(feature = "vrf")]
@@ -831,13 +829,9 @@ where
831829
};
832830

833831
// Bootstrap contracts
834-
let bootstrap = bootstrap_sidecars(
835-
&bootstrap_config,
836-
node.backend(),
837-
node.block_producer(),
838-
node.pool(),
839-
)
840-
.await?;
832+
let bootstrap =
833+
bootstrap_sidecars(&bootstrap_config, node.backend(), node.block_producer(), node.pool())
834+
.await?;
841835

842836
// Build sidecar start config
843837
let paymaster_config = paymaster_sidecar.map(|info| PaymasterSidecarConfig {

‎crates/cli/src/sidecar.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ pub async fn bootstrap_sidecars<EF, PF>(
135135
where
136136
EF: ExecutorFactory,
137137
PF: ProviderFactory,
138-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
139-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
138+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
139+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
140140
{
141141
let mut result = BootstrapResult::default();
142142

@@ -164,8 +164,8 @@ async fn bootstrap_paymaster<EF, PF>(
164164
where
165165
EF: ExecutorFactory,
166166
PF: ProviderFactory,
167-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
168-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
167+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
168+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
169169
{
170170
let (relayer_address, relayer_private_key) = prefunded_account(backend, prefunded_index)?;
171171
let gas_tank_index = prefunded_index
@@ -252,8 +252,8 @@ pub fn derive_vrf_accounts<EF, PF>(
252252
where
253253
EF: ExecutorFactory,
254254
PF: ProviderFactory,
255-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
256-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
255+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
256+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
257257
{
258258
let (source_address, source_private_key) = match config.key_source {
259259
VrfKeySource::Prefunded => prefunded_account(backend, config.prefunded_index)?,
@@ -298,8 +298,8 @@ async fn bootstrap_vrf<EF, PF>(
298298
where
299299
EF: ExecutorFactory,
300300
PF: ProviderFactory,
301-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
302-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
301+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
302+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
303303
{
304304
let derived = derive_vrf_accounts(config, backend)?;
305305
let account_address = derived.source_address;
@@ -386,8 +386,8 @@ fn prefunded_account<EF, PF>(
386386
where
387387
EF: ExecutorFactory,
388388
PF: ProviderFactory,
389-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
390-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
389+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
390+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
391391
{
392392
let (address, allocation) = backend
393393
.chain_spec
@@ -412,8 +412,8 @@ fn sequencer_account<EF, PF>(
412412
where
413413
EF: ExecutorFactory,
414414
PF: ProviderFactory,
415-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
416-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
415+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
416+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
417417
{
418418
for (address, allocation) in backend.chain_spec.genesis().accounts() {
419419
if *address == sequencer_address {
@@ -446,8 +446,8 @@ async fn ensure_deployed<EF, PF>(
446446
where
447447
EF: ExecutorFactory,
448448
PF: ProviderFactory,
449-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
450-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
449+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
450+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
451451
{
452452
let DeploymentRequest {
453453
sender_address,
@@ -494,8 +494,8 @@ async fn fund_account<EF, PF>(
494494
where
495495
EF: ExecutorFactory,
496496
PF: ProviderFactory,
497-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
498-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
497+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
498+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
499499
{
500500
let amount = Felt::from(1_000_000_000_000_000_000u128);
501501
let (low, high) = split_u256(U256::from_be_bytes(amount.to_bytes_be()));
@@ -528,8 +528,8 @@ async fn submit_invoke<EF, PF>(
528528
where
529529
EF: ExecutorFactory,
530530
PF: ProviderFactory,
531-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
532-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
531+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
532+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
533533
{
534534
let state = backend.storage.provider().latest()?;
535535
let nonce = account_nonce(pool, state.as_ref(), sender_address)?;
@@ -616,8 +616,8 @@ fn is_deployed<EF, PF>(backend: &Backend<EF, PF>, address: ContractAddress) -> R
616616
where
617617
EF: ExecutorFactory,
618618
PF: ProviderFactory,
619-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
620-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
619+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
620+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
621621
{
622622
let state = backend.storage.provider().latest()?;
623623
Ok(state.class_hash_of_contract(address)?.is_some())
@@ -631,8 +631,8 @@ async fn wait_for_contract<EF, PF>(
631631
where
632632
EF: ExecutorFactory,
633633
PF: ProviderFactory,
634-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
635-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
634+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
635+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
636636
{
637637
let start = Instant::now();
638638
loop {

‎crates/node/src/sidecar.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ pub fn derive_vrf_accounts<EF, PF>(
4242
where
4343
EF: ExecutorFactory,
4444
PF: ProviderFactory,
45-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
46-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
45+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
46+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
4747
{
4848
let (source_address, source_private_key) = match config.key_source {
4949
VrfKeySource::Prefunded => prefunded_account(backend, config.prefunded_index)?,
@@ -84,8 +84,8 @@ fn prefunded_account<EF, PF>(
8484
where
8585
EF: ExecutorFactory,
8686
PF: ProviderFactory,
87-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
88-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
87+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
88+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
8989
{
9090
let (address, allocation) = backend
9191
.chain_spec
@@ -109,8 +109,8 @@ fn sequencer_account<EF, PF>(
109109
where
110110
EF: ExecutorFactory,
111111
PF: ProviderFactory,
112-
<PF as ProviderFactory>::Provider: katana_core::backend::storage::ProviderRO,
113-
<PF as ProviderFactory>::ProviderMut: katana_core::backend::storage::ProviderRW,
112+
<PF as ProviderFactory>::Provider: katana_provider::ProviderRO,
113+
<PF as ProviderFactory>::ProviderMut: katana_provider::ProviderRW,
114114
{
115115
let sequencer = config.chain.genesis().sequencer_address;
116116

0 commit comments

Comments
 (0)