From 2c9361c6b51f61d9c07f2e7b87a3c1530d3a3b33 Mon Sep 17 00:00:00 2001 From: Pravdyvy Date: Thu, 19 Mar 2026 13:01:43 +0200 Subject: [PATCH] fix: suggestions 1 --- indexer/core/src/config.rs | 4 ++-- indexer/core/src/lib.rs | 8 +++++--- integration_tests/src/config.rs | 12 ++++++------ sequencer_core/src/config.rs | 4 ++-- sequencer_core/src/lib.rs | 12 +++++++----- sequencer_rpc/src/process.rs | 4 ++-- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/indexer/core/src/config.rs b/indexer/core/src/config.rs index 5eb8dd92..fced57d9 100644 --- a/indexer/core/src/config.rs +++ b/indexer/core/src/config.rs @@ -36,9 +36,9 @@ pub struct IndexerConfig { pub bedrock_client_config: ClientConfig, pub channel_id: ChannelId, #[serde(skip_serializing_if = "Option::is_none")] - pub initial_accounts: Option>, + pub initial_public_accounts: Option>, #[serde(skip_serializing_if = "Option::is_none")] - pub initial_commitments: Option>, + pub initial_private_accounts: Option>, } impl IndexerConfig { diff --git a/indexer/core/src/lib.rs b/indexer/core/src/lib.rs index 1f20e822..ca17bd64 100644 --- a/indexer/core/src/lib.rs +++ b/indexer/core/src/lib.rs @@ -58,7 +58,7 @@ impl IndexerCore { let genesis_block = hashable_data.into_pending_block(&signing_key, channel_genesis_msg_id); let initial_commitments: Option> = config - .initial_commitments + .initial_private_accounts .clone() .map(|initial_commitments| { initial_commitments @@ -76,8 +76,10 @@ impl IndexerCore { .collect() }); - let init_accs: Option> = - config.initial_accounts.clone().map(|initial_accounts| { + let init_accs: Option> = config + .initial_public_accounts + .clone() + .map(|initial_accounts| { initial_accounts .iter() .map(|acc_data| (acc_data.account_id, acc_data.balance)) diff --git a/integration_tests/src/config.rs b/integration_tests/src/config.rs index 875e1652..98181d26 100644 --- a/integration_tests/src/config.rs +++ b/integration_tests/src/config.rs @@ -105,7 +105,7 @@ impl InitialData { } } - fn sequencer_initial_accounts(&self) -> Vec { + fn sequencer_initial_public_accounts(&self) -> Vec { self.public_accounts .iter() .map(|(priv_key, balance)| { @@ -119,7 +119,7 @@ impl InitialData { .collect() } - fn sequencer_initial_commitments(&self) -> Vec { + fn sequencer_initial_private_accounts(&self) -> Vec { self.private_accounts .iter() .map(|(key_chain, account)| PrivateAccountPublicInitialData { @@ -184,8 +184,8 @@ pub fn indexer_config( max_retries: 10, }, }, - initial_accounts: Some(initial_data.sequencer_initial_accounts()), - initial_commitments: Some(initial_data.sequencer_initial_commitments()), + initial_public_accounts: Some(initial_data.sequencer_initial_public_accounts()), + initial_private_accounts: Some(initial_data.sequencer_initial_private_accounts()), signing_key: [37; 32], channel_id: bedrock_channel_id(), }) @@ -216,8 +216,8 @@ pub fn sequencer_config( block_create_timeout, retry_pending_blocks_timeout: Duration::from_secs(120), port: 0, - initial_accounts: Some(initial_data.sequencer_initial_accounts()), - initial_commitments: Some(initial_data.sequencer_initial_commitments()), + initial_public_accounts: Some(initial_data.sequencer_initial_public_accounts()), + initial_private_accounts: Some(initial_data.sequencer_initial_private_accounts()), signing_key: [37; 32], bedrock_config: BedrockConfig { backoff: BackoffConfig { diff --git a/sequencer_core/src/config.rs b/sequencer_core/src/config.rs index 46ee6945..571ead1a 100644 --- a/sequencer_core/src/config.rs +++ b/sequencer_core/src/config.rs @@ -50,9 +50,9 @@ pub struct SequencerConfig { /// Indexer RPC URL. pub indexer_rpc_url: Url, #[serde(skip_serializing_if = "Option::is_none")] - pub initial_accounts: Option>, + pub initial_public_accounts: Option>, #[serde(skip_serializing_if = "Option::is_none")] - pub initial_commitments: Option>, + pub initial_private_accounts: Option>, } #[derive(Clone, Serialize, Deserialize)] diff --git a/sequencer_core/src/lib.rs b/sequencer_core/src/lib.rs index 5f5653da..22a388dd 100644 --- a/sequencer_core/src/lib.rs +++ b/sequencer_core/src/lib.rs @@ -103,7 +103,7 @@ impl SequencerCore> = config - .initial_commitments + .initial_private_accounts .clone() .map(|initial_commitments| { initial_commitments @@ -121,8 +121,10 @@ impl SequencerCore> = - config.initial_accounts.clone().map(|initial_accounts| { + let init_accs: Option> = config + .initial_public_accounts + .clone() + .map(|initial_accounts| { initial_accounts .iter() .map(|acc_data| (acc_data.account_id, acc_data.balance)) @@ -419,8 +421,8 @@ mod tests { }, retry_pending_blocks_timeout: Duration::from_secs(60 * 4), indexer_rpc_url: "ws://localhost:8779".parse().unwrap(), - initial_accounts: None, - initial_commitments: None, + initial_public_accounts: None, + initial_private_accounts: None, } } diff --git a/sequencer_rpc/src/process.rs b/sequencer_rpc/src/process.rs index ce27e3f7..d662dacd 100644 --- a/sequencer_rpc/src/process.rs +++ b/sequencer_rpc/src/process.rs @@ -385,8 +385,8 @@ mod tests { }), }, indexer_rpc_url: "ws://localhost:8779".parse().unwrap(), - initial_accounts: None, - initial_commitments: None, + initial_public_accounts: None, + initial_private_accounts: None, } }