From 364e4b1d3ef13f166b775f3e4a04ff8c16e4f9d5 Mon Sep 17 00:00:00 2001
From: striderDM <51991544+StriderDM@users.noreply.github.com>
Date: Thu, 2 Sep 2021 22:09:37 +0200
Subject: [PATCH] fix: resolved feature flags for openssl vendoring

Include vendored openssl library when not building ffi wallet library.
Exclude vendored openssl library when building ffi wallet library as it needs to be cross compiled for mobile.
Restored packages to ci.yml.
---
 .github/workflows/ci.yml                    | 4 ++++
 Cargo.lock                                  | 2 +-
 base_layer/wallet_ffi/Cargo.toml            | 2 +-
 comms/Cargo.toml                            | 3 ++-
 integration_tests/features/support/world.js | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e06489df6..5a98ed91c3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,7 +52,9 @@ jobs:
         run: |
           sudo apt-get update && \
           sudo apt-get -y install \
+            openssl \
             libssl-dev \
+            libsqlite3-dev \
             pkg-config \
             git \
             cmake \
@@ -110,7 +112,9 @@ jobs:
         run: |
           sudo apt-get update && \
           sudo apt-get -y install \
+            openssl \
             libssl-dev \
+            libsqlite3-dev \
             pkg-config \
             git \
             cmake \
diff --git a/Cargo.lock b/Cargo.lock
index d5a2386024..56f3165a18 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4517,7 +4517,7 @@ dependencies = [
  "log 0.4.14",
  "multiaddr",
  "nom 5.1.2",
- "openssl",
+ "openssl-sys",
  "opentelemetry",
  "opentelemetry-jaeger",
  "pin-project 1.0.8",
diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml
index a49a3e923c..63c78f00b3 100644
--- a/base_layer/wallet_ffi/Cargo.toml
+++ b/base_layer/wallet_ffi/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.17.6"
 edition = "2018"
 
 [dependencies]
-tari_comms = { version = "^0.9", path = "../../comms", default-features = false}
+tari_comms = { version = "^0.9", path = "../../comms", features = ["c_integration"]}
 tari_comms_dht = { version = "^0.9", path = "../../comms/dht", default-features = false }
 tari_common_types = {path="../common_types"}
 tari_crypto = "0.11.1"
diff --git a/comms/Cargo.toml b/comms/Cargo.toml
index 02866e17a5..fe775a000c 100644
--- a/comms/Cargo.toml
+++ b/comms/Cargo.toml
@@ -30,7 +30,7 @@ lmdb-zero = "0.4.4"
 log = { version = "0.4.0", features = ["std"] }
 multiaddr = { version = "0.13.0" }
 nom = { version = "5.1.0", features = ["std"], default-features = false }
-openssl = { version = "0.10", features = ["vendored"] }
+openssl-sys = { version = "0.9.66", features = ["vendored"], optional = true }
 pin-project = "1.0.8"
 prost = "=0.8.0"
 rand = "0.8"
@@ -66,5 +66,6 @@ tempfile = "3.1.0"
 tari_common = { version = "^0.9", path = "../common", features = ["build"] }
 
 [features]
+c_integration = []
 avx2 = ["tari_crypto/avx2"]
 rpc = ["tower-make"]
diff --git a/integration_tests/features/support/world.js b/integration_tests/features/support/world.js
index 833b681138..cc73a5de2c 100644
--- a/integration_tests/features/support/world.js
+++ b/integration_tests/features/support/world.js
@@ -350,7 +350,7 @@ class CustomWorld {
 
 setWorldConstructor(CustomWorld);
 
-BeforeAll({ timeout: 1200000 }, async function () {
+BeforeAll({ timeout: 2400000 }, async function () {
   const baseNode = new BaseNodeProcess("compile");
   console.log("Compiling base node...");
   await baseNode.init();