Merge btsieve crate into cnd

Author: thomaseizinger

Cargo.lock

@@ -1,2 +1,2 @@
 [workspace]
-members = ["cnd", "btsieve", "libp2p-comit", "internal/*"]
+members = ["cnd", "libp2p-comit", "internal/*"]

Cargo.toml

@@ -49,6 +49,8 @@ all: format build clippy test doc e2e_scripts
 format: install_rustfmt install_tomlfmt yarn_install
 	$(CARGO_NIGHTLY) fmt
 	$(CARGO) tomlfmt -p Cargo.toml
+	$(CARGO) tomlfmt -p cnd/Cargo.toml
+	$(CARGO) tomlfmt -p libp2p-comit/Cargo.toml
 	(cd ./api_tests; yarn run fix)
 
 ci: check_format doc clippy test build e2e

Makefile

@@ -12,7 +12,6 @@ async-trait = "0.1"
 binary_macros = "0.6"
 bitcoin = "0.19.1"
 blockchain_contracts = "0.1"
-btsieve = { version = "0.1.0", path = "../btsieve" }
 chrono = { version = "0.4", features = ["serde"] }
 config = { version = "0.9", features = ["toml"] }
 debug_stub_derive = "0.3"
@@ -23,6 +22,7 @@ diesel_migrations = "1.4.0"
 directories = "2.0"
 either = "1.5"
 enum-display-derive = "0.1"
+ethbloom = "0.6.4"
 ethereum_support = { path = "../internal/ethereum_support" }
 fern = { version = "0.5", features = ["colored"] }
 futures = { version = "0.1" }
@@ -54,6 +54,7 @@ state_machine_future = { version = "0.2" }
 structopt = "0.3"
 strum = "0.16"
 strum_macros = "0.16"
+testcontainers = "0.8"
 thiserror = "1"
 tokio = "0.1"
 toml = "0.5"

btsieve/Cargo.toml

@@ -3,10 +3,6 @@
 
 pub mod bitcoin;
 pub mod ethereum;
-pub mod first_or_else;
-
-#[cfg(test)]
-pub mod quickcheck;
 
 use tokio::prelude::{Future, Stream};
 

btsieve/src/bitcoin/quickcheck_impls.rs

@@ -1,4 +1,6 @@
-use crate::{bitcoin::bitcoin_http_request_for_hex_encoded_object, BlockByHash, LatestBlock};
+use crate::btsieve::{
+    bitcoin::bitcoin_http_request_for_hex_encoded_object, BlockByHash, LatestBlock,
+};
 use bitcoin::{hashes::sha256d, Network};
 use reqwest::{r#async::Client, Url};
 use serde::Deserialize;
@@ -9,7 +11,7 @@ struct ChainInfo {
     bestblockhash: sha256d::Hash,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct BitcoindConnector {
     chaininfo_url: Url,
     raw_block_by_hash_url: Url,
@@ -33,7 +35,7 @@ impl BitcoindConnector {
 }
 
 impl LatestBlock for BitcoindConnector {
-    type Error = crate::bitcoin::Error;
+    type Error = crate::btsieve::bitcoin::Error;
     type Block = bitcoin::Block;
     type BlockHash = sha256d::Hash;
 
@@ -66,7 +68,7 @@ impl LatestBlock for BitcoindConnector {
 }
 
 impl BlockByHash for BitcoindConnector {
-    type Error = crate::bitcoin::Error;
+    type Error = crate::btsieve::bitcoin::Error;
     type Block = bitcoin::Block;
     type BlockHash = sha256d::Hash;