Przeglądaj źródła

Cargo.toml: reenabled p2p-tor feature and dropped libsqlite3-sys dep

skoupidi 1 rok temu
rodzic
commit
5f4e2803a9
4 zmienionych plików z 3 dodań i 12 usunięć
  1. 0 1
      Cargo.lock
  2. 1 9
      Cargo.toml
  3. 1 1
      bin/darkirc/Cargo.toml
  4. 1 1
      example/dchat/dchatd/Cargo.toml

+ 0 - 1
Cargo.lock

@@ -1974,7 +1974,6 @@ dependencies = [
  "halo2_proofs",
  "lazy_static",
  "libc",
- "libsqlite3-sys",
  "log",
  "num-bigint",
  "pin-project-lite 0.2.14",

+ 1 - 9
Cargo.toml

@@ -117,9 +117,6 @@ wasmer = {version = "4.3.4", optional = true}
 wasmer-compiler-singlepass = {version = "4.3.4", optional = true}
 wasmer-middlewares = {version = "4.3.4", optional = true}
 
-# SQLite stuff
-libsqlite3-sys = {version = "0.28.0", features = ["sqlcipher"], optional = true}
-
 # Blockchain store
 sled = {version = "0.34.7", optional = true}
 sled-overlay = {version = "0.1.2", optional = true}
@@ -231,7 +228,6 @@ p2p-tor = [
     "tor-rtcompat",
     "tor-proto",
     "tor-cell",
-    "libsqlite3-sys",
 ]
 
 net = [
@@ -259,11 +255,7 @@ net = [
     "util",
 
     "p2p-tcp",
-    # This is temporarily disabled and for now is opt in.
-    # The issue is with OpenSSL on Android. While it can be disabled in arti,
-    # tor-dirmgr depends on sqlite/sqlcipher vis rusqlite. While this can be
-    # bundled, then for the crypto it requires OpenSSL again.
-    #"p2p-tor",
+    "p2p-tor",
     #"p2p-nym",
     "p2p-unix",
 ]

+ 1 - 1
bin/darkirc/Cargo.toml

@@ -18,7 +18,7 @@ name = "darkirc"
 path = "src/main.rs"
 
 [dependencies]
-darkfi = {path = "../../", features = ["async-daemonize", "event-graph", "net", "p2p-tor", "util", "system", "rpc", "zk"]}
+darkfi = {path = "../../", features = ["async-daemonize", "event-graph", "net", "util", "system", "rpc", "zk"]}
 darkfi-sdk = {path = "../../src/sdk", features = ["async"]}
 darkfi-serial = {path = "../../src/serial", features = ["async"]}
 libc = "0.2.155"

+ 1 - 1
example/dchat/dchatd/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2021"
 # ANCHOR: dependencies
 [dependencies]
 # ANCHOR: darkfi
-darkfi = {path = "../../../", features = ["net", "toml", "system", "async-daemonize", "rpc", "p2p-tor"]}
+darkfi = {path = "../../../", features = ["net", "toml", "system", "async-daemonize", "rpc"]}
 darkfi-serial = {path = "../../../src/serial"}
 # ANCHOR_END: darkfi