From f076893dcd76fce8865edc59cd0db4e9db0a7a50 Mon Sep 17 00:00:00 2001 From: Jude Nelson Date: Tue, 27 Apr 2021 21:19:58 -0400 Subject: [PATCH] fix merge artifact --- testnet/stacks-node/src/run_loop/neon.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/testnet/stacks-node/src/run_loop/neon.rs b/testnet/stacks-node/src/run_loop/neon.rs index 9476a6e07..83ccb8942 100644 --- a/testnet/stacks-node/src/run_loop/neon.rs +++ b/testnet/stacks-node/src/run_loop/neon.rs @@ -1,9 +1,3 @@ -use std::cmp; -use std::sync::atomic::{AtomicBool, Ordering}; -use std::sync::mpsc::sync_channel; -use std::sync::Arc; -use std::thread; - use ctrlc as termination; use stacks::burnchains::bitcoin::address::BitcoinAddress; @@ -16,7 +10,7 @@ use stacks::chainstate::coordinator::{ }; use stacks::chainstate::stacks::db::{ChainStateBootData, ClarityTx, StacksChainState}; use stacks::net::atlas::{AtlasConfig, Attachment}; -use stacks::vm::types::{OptionalData, PrincipalData, Value}; +use stacks::vm::types::{PrincipalData, Value}; use std::cmp; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc::sync_channel;