Skip to content

Commit

Permalink
merge woes
Browse files Browse the repository at this point in the history
  • Loading branch information
tippenein committed Jan 23, 2024
1 parent a79233c commit 6bca7b7
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 119 deletions.
1 change: 0 additions & 1 deletion components/stacks-devnet-js/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ impl StacksDevnet {
let res = hiro_system_kit::nestable_block_on(do_run_local_devnet(
devnet,
deployment,
&mut None,
Some(log_tx),
false,
stacks_network::Context::empty(),
Expand Down
104 changes: 0 additions & 104 deletions components/stacks-network/src/chainhooks.rs

This file was deleted.

1 change: 0 additions & 1 deletion components/stacks-network/src/chains_coordinator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use crate::event::Status;
use crate::orchestrator::ServicesMapHosts;

use base58::FromBase58;
use chainhook_sdk::chainhooks::types::ChainhookConfig;
use chainhook_sdk::observer::{
start_event_observer, EventObserverConfig, ObserverCommand, ObserverEvent,
StacksChainMempoolEvent,
Expand Down
14 changes: 1 addition & 13 deletions components/stacks-network/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use hiro_system_kit::slog;
use std::path::PathBuf;
use std::sync::mpsc::channel;

use stacks_network::{do_run_chain_coordinator, load_chainhooks};
use stacks_network::do_run_chain_coordinator;
use stacks_network::{Context, DevnetOrchestrator};

#[derive(Parser, Debug)]
Expand Down Expand Up @@ -60,16 +60,6 @@ fn main() {
let deployment = serde_yaml::from_slice(&deployment_specification_file_content)
.unwrap_or_else(|e| panic!("deployment plan malformatted {:?}", e));

let chainhooks = match load_chainhooks(
&manifest_location,
&(BitcoinNetwork::Regtest, StacksNetwork::Devnet),
) {
Ok(hooks) => hooks,
Err(e) => {
panic!("failed to load chainhooks {}", e);
}
};

let logger = hiro_system_kit::log::setup_logger();
let _guard = hiro_system_kit::log::setup_global_logger(logger.clone());
let ctx = Context {
Expand All @@ -82,8 +72,6 @@ fn main() {
let res = hiro_system_kit::nestable_block_on(do_run_chain_coordinator(
orchestrator,
deployment,
&mut Some(chainhooks),
None,
ctx,
orchestrator_terminated_tx,
&args.namespace,
Expand Down

0 comments on commit 6bca7b7

Please sign in to comment.