From f475e359f2708aae1aa50962ae4fd963a9413607 Mon Sep 17 00:00:00 2001
From: brianp <brian.o.pearce@gmail.com>
Date: Fri, 14 Apr 2023 12:40:51 +0200
Subject: [PATCH] Remove common as dependency form tari-features

Features is now a frequently used build dep in most our crates. Common
actually also needs to be feature aware during build time. This means
tari-features should have little to no dependencies, and especially none
from our own crates.
---
 Cargo.lock                           |  4 +---
 common/Cargo.toml                    |  3 +++
 common/build.rs                      |  9 +++++++++
 common/tari_features/Cargo.toml      |  5 +++--
 common/tari_features/src/resolver.rs | 26 +++++++++++++-------------
 5 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 common/build.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7d6eb51521..7b008c711b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5271,6 +5271,7 @@ dependencies = [
  "sha2 0.9.9",
  "structopt",
  "tari_crypto",
+ "tari_features",
  "tari_test_utils",
  "tempfile",
  "thiserror",
@@ -5593,9 +5594,6 @@ dependencies = [
 [[package]]
 name = "tari_features"
 version = "0.50.0-pre.0"
-dependencies = [
- "tari_common",
-]
 
 [[package]]
 name = "tari_integration_tests"
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 2f323abf15..5b604ff1d3 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -38,3 +38,6 @@ blake2 = "0.9.1"
 [dev-dependencies]
 tari_test_utils = {  path = "../infrastructure/test_utils"}
 toml = "0.5.8"
+
+[build-dependencies]
+tari_features = { version = "0.50.0-pre.0", path = "./tari_features"}
diff --git a/common/build.rs b/common/build.rs
new file mode 100644
index 0000000000..0f5c3f4939
--- /dev/null
+++ b/common/build.rs
@@ -0,0 +1,9 @@
+// Copyright 2023 The Tari Project
+// SPDX-License-Identifier: BSD-3-Clause
+
+use tari_features::resolver::build_features;
+
+pub fn main() {
+    build_features();
+    // Build as usual
+}
diff --git a/common/tari_features/Cargo.toml b/common/tari_features/Cargo.toml
index 2b0e3b1631..3f6dc95781 100644
--- a/common/tari_features/Cargo.toml
+++ b/common/tari_features/Cargo.toml
@@ -11,5 +11,6 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
-tari_common = { path = "../../common" }
\ No newline at end of file
+# So you're thinking about adding a dependency here?
+# This crate is utilized in the compilation of _most_ of our other crates. You're probably about
+# to create a cyclic depedency. Please think hard whether this change is actually required.
\ No newline at end of file
diff --git a/common/tari_features/src/resolver.rs b/common/tari_features/src/resolver.rs
index 8dde5f5fa6..3edb0edfc7 100644
--- a/common/tari_features/src/resolver.rs
+++ b/common/tari_features/src/resolver.rs
@@ -20,9 +20,7 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use std::{fmt::Display, str::FromStr};
-
-use tari_common::configuration::Network;
+use std::fmt::Display;
 
 use crate::{Feature, FEATURE_LIST};
 
@@ -40,6 +38,17 @@ impl Target {
             Target::TestNet => "testnet",
         }
     }
+
+    pub fn from_network_str(value: &str) -> Self {
+        // The duplication of network names here isn't great but we're being lazy and non-exhaustive
+        // regarding the endless testnet possibilities. This minor MainNet, StageNet, and NextNet
+        // duplication allows us to leave the crate dependency free.
+        match value.to_lowercase().as_str() {
+            "mainnet" | "stagenet" => Target::MainNet,
+            "nextnet" => Target::NextNet,
+            _ => Target::TestNet,
+        }
+    }
 }
 
 impl Display for Target {
@@ -64,16 +73,7 @@ pub fn identify_target() -> Target {
 
 pub fn check_envar(envar: &str) -> Option<Target> {
     match std::env::var(envar) {
-        Ok(s) => {
-            let network =
-                Network::from_str(s.to_lowercase().as_str()).unwrap_or_else(|_| panic!("Unknown network, {}", s));
-            match network {
-                Network::MainNet | Network::StageNet => Some(Target::MainNet),
-                Network::NextNet => Some(Target::NextNet),
-                Network::LocalNet | Network::Igor | Network::Esmeralda => Some(Target::TestNet),
-                Network::Weatherwax | Network::Ridcully | Network::Stibbons | Network::Dibbler => None,
-            }
-        },
+        Ok(s) => Some(Target::from_network_str(s.to_lowercase().as_str())),
         _ => None,
     }
 }