logos-blockchain/logos-execution-zone
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-execution-zone.git synced 2026-03-24 03:03:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: suggestions 1

Browse Source
This commit is contained in:
Pravdyvy 2026-03-19 13:01:43 +02:00
parent a0ab6ad92d
commit 2c9361c6b5
6 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indexer/core/src/config.rs
View File

@ -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<Vec<PublicAccountPublicInitialData>>,
pub initial_public_accounts: Option<Vec<PublicAccountPublicInitialData>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub initial_commitments: Option<Vec<PrivateAccountPublicInitialData>>,
pub initial_private_accounts: Option<Vec<PrivateAccountPublicInitialData>>,
}
impl IndexerConfig {

8
indexer/core/src/lib.rs
View File

@ -58,7 +58,7 @@ impl IndexerCore {
let genesis_block = hashable_data.into_pending_block(&signing_key, channel_genesis_msg_id);
let initial_commitments: Option<Vec<nssa_core::Commitment>> = config
.initial_commitments
.initial_private_accounts
.clone()
.map(|initial_commitments| {
initial_commitments
@ -76,8 +76,10 @@ impl IndexerCore {
.collect()
});
let init_accs: Option<Vec<(nssa::AccountId, u128)>> =
config.initial_accounts.clone().map(|initial_accounts| {
let init_accs: Option<Vec<(nssa::AccountId, u128)>> = config
.initial_public_accounts
.clone()
.map(|initial_accounts| {
initial_accounts
.iter()
.map(|acc_data| (acc_data.account_id, acc_data.balance))

12
integration_tests/src/config.rs
View File

@ -105,7 +105,7 @@ impl InitialData {
}
}
fn sequencer_initial_accounts(&self) -> Vec<PublicAccountPublicInitialData> {
fn sequencer_initial_public_accounts(&self) -> Vec<PublicAccountPublicInitialData> {
self.public_accounts
.iter()
.map(|(priv_key, balance)| {
@ -119,7 +119,7 @@ impl InitialData {
.collect()
}
fn sequencer_initial_commitments(&self) -> Vec<PrivateAccountPublicInitialData> {
fn sequencer_initial_private_accounts(&self) -> Vec<PrivateAccountPublicInitialData> {
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 {

4
sequencer_core/src/config.rs
View File

@ -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<Vec<PublicAccountPublicInitialData>>,
pub initial_public_accounts: Option<Vec<PublicAccountPublicInitialData>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub initial_commitments: Option<Vec<PrivateAccountPublicInitialData>>,
pub initial_private_accounts: Option<Vec<PrivateAccountPublicInitialData>>,
}
#[derive(Clone, Serialize, Deserialize)]

12
sequencer_core/src/lib.rs
View File

@ -103,7 +103,7 @@ impl<BC: BlockSettlementClientTrait, IC: IndexerClientTrait> SequencerCore<BC, I
);
let initial_commitments: Option<Vec<nssa_core::Commitment>> = config
.initial_commitments
.initial_private_accounts
.clone()
.map(|initial_commitments| {
initial_commitments
@ -121,8 +121,10 @@ impl<BC: BlockSettlementClientTrait, IC: IndexerClientTrait> SequencerCore<BC, I
.collect()
});
let init_accs: Option<Vec<(nssa::AccountId, u128)>> =
config.initial_accounts.clone().map(|initial_accounts| {
let init_accs: Option<Vec<(nssa::AccountId, u128)>> = 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,
}
}

4
sequencer_rpc/src/process.rs
View File

@ -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,
}
}