logos-blockchain/lssa
1
0
Fork 0
mirror of https://github.com/logos-blockchain/lssa.git synced 2026-01-05 23:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: comments fix

Browse Source
This commit is contained in:
Oleksandr Pravdyvyi 2025-08-01 18:32:30 +03:00
parent f5d9990cc8
commit 5d42e53b18
No known key found for this signature in database
GPG Key ID: 9F8955C63C443871
2 changed files with 54 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
integration_tests/src/lib.rs
View File

@ -6,7 +6,8 @@ use clap::Parser;
use common::rpc_primitives::RpcConfig;
use log::info;
use node_core::{NodeCore, config::NodeConfig};
use sequencer_core::{SequencerCore, config::SequencerConfig};
use sequencer_core::config::SequencerConfig;
use sequencer_runner::startup_sequencer;
use tempfile::TempDir;
use tokio::{sync::Mutex, task::JoinHandle};
@ -47,42 +48,8 @@ pub async fn pre_test(
let (temp_dir_node, temp_dir_sequencer) =
replace_home_dir_with_temp_dir_in_configs(&mut node_config, &mut sequencer_config);
let block_timeout = sequencer_config.block_create_timeout_millis;
let sequencer_port = sequencer_config.port;
let sequencer_core = SequencerCore::start_from_config(sequencer_config);
info!("Sequencer core set up");
let seq_core_wrapped = Arc::new(Mutex::new(sequencer_core));
let http_server = sequencer_rpc::new_http_server(
RpcConfig::with_port(sequencer_port),
seq_core_wrapped.clone(),
)?;
info!("HTTP server started");
let seq_http_server_handle = http_server.handle();
tokio::spawn(http_server);
info!("Starting main sequencer loop");
let sequencer_loop_handle: JoinHandle<Result<()>> = tokio::spawn(async move {
loop {
tokio::time::sleep(std::time::Duration::from_millis(block_timeout)).await;
info!("Collecting transactions from mempool, block creation");
let id = {
let mut state = seq_core_wrapped.lock().await;
state.produce_new_block_with_mempool_transactions()?
};
info!("Block with id {id} created");
info!("Waiting for new transactions");
}
});
let (seq_http_server_handle, sequencer_loop_handle) =
startup_sequencer(sequencer_config).await?;
let node_port = node_config.port;
@ -185,7 +152,7 @@ pub async fn test_success_move_to_another_account(wrapped_node_core: Arc<Mutex<N
let acc_sender = hex::decode(ACC_SENDER).unwrap().try_into().unwrap();
let acc_receiver_new_acc = [42; 32];
let hex_acc_reveiver_new_acc = hex::encode(acc_receiver_new_acc);
let hex_acc_receiver_new_acc = hex::encode(acc_receiver_new_acc);
let guard = wrapped_node_core.lock().await;
@ -205,7 +172,7 @@ pub async fn test_success_move_to_another_account(wrapped_node_core: Arc<Mutex<N
.unwrap();
let acc_2_balance = guard
.sequencer_client
.get_account_balance(hex_acc_reveiver_new_acc)
.get_account_balance(hex_acc_receiver_new_acc)
.await
.unwrap();

51
sequencer_runner/src/lib.rs
View File

@ -1,12 +1,13 @@
use std::{path::PathBuf, sync::Arc};
use actix_web::dev::ServerHandle;
use anyhow::Result;
use clap::Parser;
use common::rpc_primitives::RpcConfig;
use log::info;
use sequencer_core::SequencerCore;
use sequencer_core::{config::SequencerConfig, SequencerCore};
use sequencer_rpc::new_http_server;
use tokio::sync::Mutex;
use tokio::{sync::Mutex, task::JoinHandle};
pub mod config;
@ -19,37 +20,26 @@ struct Args {
home_dir: PathBuf,
}
pub async fn main_runner() -> Result<()> {
let args = Args::parse();
let Args { home_dir } = args;
let app_config = config::from_file(home_dir.join("sequencer_config.json"))?;
pub async fn startup_sequencer(
app_config: SequencerConfig,
) -> Result<(ServerHandle, JoinHandle<Result<()>>)> {
let block_timeout = app_config.block_create_timeout_millis;
let port = app_config.port;
if let Some(ref rust_log) = app_config.override_rust_log {
info!("RUST_LOG env var set to {rust_log:?}");
std::env::set_var(RUST_LOG, rust_log);
}
env_logger::init();
let sequencer_core = SequencerCore::start_from_config(app_config);
info!("Sequncer core set up");
info!("Sequencer core set up");
let seq_core_wrapped = Arc::new(Mutex::new(sequencer_core));
let http_server = new_http_server(RpcConfig::with_port(port), seq_core_wrapped.clone())?;
info!("HTTP server started");
let _http_server_handle = http_server.handle();
let http_server_handle = http_server.handle();
tokio::spawn(http_server);
info!("Starting main sequencer loop");
#[allow(clippy::empty_loop)]
let main_loop_handle = tokio::spawn(async move {
loop {
tokio::time::sleep(std::time::Duration::from_millis(block_timeout)).await;
@ -65,4 +55,27 @@ pub async fn main_runner() -> Result<()> {
info!("Waiting for new transactions");
}
});
Ok((http_server_handle, main_loop_handle))
}
pub async fn main_runner() -> Result<()> {
env_logger::init();
let args = Args::parse();
let Args { home_dir } = args;
let app_config = config::from_file(home_dir.join("sequencer_config.json"))?;
if let Some(ref rust_log) = app_config.override_rust_log {
info!("RUST_LOG env var set to {rust_log:?}");
std::env::set_var(RUST_LOG, rust_log);
}
//ToDo: Add restart on failures
let (_, _) = startup_sequencer(app_config).await?;
Ok(())
}