Merge pull request #141 from erikh/refactors

Refactors

Cargo.toml

@@ -18,22 +18,23 @@ regex = ">= 0"
 anyhow = ">= 0"
 clap = { version = "^3", features = ["derive"] }
 ipnetwork = ">= 0"
-trust-dns-resolver = "0.20.2"
-trust-dns-server = { version = "0.20.2", features = ["trust-dns-resolver"] } 
+trust-dns-resolver = { version = "^0.20.4", features = ["tokio-runtime"] }
+trust-dns-server = { version = "^0.20.4", features = ["trust-dns-resolver"] } 
 tokio = { version = "1", features = ["full"] }
-zerotier-central-api = "= 1.0.2"
-zerotier-one-api = "= 1.0.4"
+zerotier-central-api = { version = "= 1.0.3", path = "../zerotier-rust-api/zerotier-central-api" }
+zerotier-one-api = { version = "= 1.0.5", path = "../zerotier-rust-api/zerotier-one-api" }
 serde = ">= 0"
 serde_json = ">= 0"
 tinytemplate = ">= 0"
 rand = ">= 0"
 num_cpus = ">=0"
 log = ">=0"
-stderrlog = ">=0"
+env_logger = ">=0"
 hex = ">=0"
 
-[features]
-integration-tests = []
+[dev-dependencies]
+async-trait = ">=0"
+lazy_static = ">=0"
 
 [package.metadata.deb]
 copyright = "ZeroTier, Inc"

Makefile

@@ -9,9 +9,9 @@ test:
 
 test-integration:
 ifneq (${SKIP},)
-	TOKEN=$$(cat test-token.txt) sudo -E bash -c "$$(which cargo) test ${RUN_TEST} --features integration-tests -- --skip '${SKIP}' --nocapture --test-threads 1"
+	TOKEN=$$(cat test-token.txt) sudo -E bash -c "$$(which cargo) test ${RUN_TEST} -- --skip '${SKIP}' --nocapture --test-threads 1"
 else
-	TOKEN=$$(cat test-token.txt) sudo -E bash -c "$$(which cargo) test ${RUN_TEST} --features integration-tests -- --nocapture --test-threads 1"
+	TOKEN=$$(cat test-token.txt) sudo -E bash -c "$$(which cargo) test ${RUN_TEST} -- --nocapture --test-threads 1"
 endif
 
 generate: central service

src/addresses.rs

@@ -18,7 +18,7 @@ fn get_parts(member: Member) -> Result<(u64, u64), anyhow::Error> {
     ))
 }
 
-pub(crate) trait Calculator {
+pub trait Calculator {
     fn sixplane(self) -> Result<IpNetwork, anyhow::Error>;
     fn rfc4193(self) -> Result<IpNetwork, anyhow::Error>;
 }