Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions crates/fiber-bin/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use ckb_chain_spec::ChainSpec;
use ckb_resource::Resource;
use core::default::Default;
use fnn::actors::RootActor;
use fnn::cch::CchMessage;
use fnn::cch::{CchArgs, CchMessage};
use fnn::ckb::contracts::TypeIDResolver;
#[cfg(debug_assertions)]
use fnn::ckb::contracts::{get_cell_deps, Contract};
Expand Down Expand Up @@ -308,16 +308,30 @@ pub async fn main() -> Result<(), ExitMessage> {
None => (None, None, None),
};

let cch_actor = match config.cch {
Some(cch_config) => {
let cch_actor = match (config.cch, &network_actor) {
(Some(cch_config), Some(network_actor)) => {
info!("Starting cch");
let ignore_startup_failure = cch_config.ignore_startup_failure;
let node_keypair = config
.fiber
.as_ref()
.ok_or_else(|| {
ExitMessage(
"failed to read secret key because fiber config is not available"
.to_string(),
)
})?
.read_or_generate_secret_key()
.map_err(|err| ExitMessage(format!("failed to read secret key: {}", err)))?;
match start_cch(
cch_config,
new_tokio_task_tracker(),
new_tokio_cancellation_token(),
CchArgs {
config: cch_config,
tracker: new_tokio_task_tracker(),
token: new_tokio_cancellation_token(),
network_actor: network_actor.clone(),
node_keypair,
},
root_actor.get_cell(),
network_actor.clone(),
)
.await
{
Expand Down Expand Up @@ -350,7 +364,7 @@ pub async fn main() -> Result<(), ExitMessage> {
}
}
}
None => None,
_ => None,
};

// Start rpc service
Expand Down
Loading
Loading