fix merge errors

Cuprate · Sep 9, 2024 · da78cbd · da78cbd
1 parent 20033ee
commit da78cbd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/binaries/cuprated/Cargo.toml b/binaries/cuprated/Cargo.toml
@@ -69,7 +69,7 @@ tokio-util            = { workspace = true }
 tokio-stream          = { workspace = true }
 tokio                 = { workspace = true }
 tower                 = { workspace = true }
-tracing-subscriber    = { workspace = true }
+tracing-subscriber    = { workspace = true, features = ["std", "fmt"] }
 tracing               = { workspace = true }
 
 #[lints]

diff --git a/consensus/src/lib.rs b/consensus/src/lib.rs
@@ -28,7 +28,7 @@ pub use transactions::{TxVerifierService, VerifyTxRequest, VerifyTxResponse};
 
 // re-export.
 pub use cuprate_consensus_rules::genesis::generate_genesis_block;
-pub use cuprate_types::blockchain::{BlockchainReadRequest, BlockchainResponse};
+pub use cuprate_types::{blockchain::{BlockchainReadRequest, BlockchainResponse}, HardFork};
 
 /// An Error returned from one of the consensus services.
 #[derive(Debug, thiserror::Error)]