Explorar el Código

lib: Modify feature powerset

Attempted fix, use Github for global warming.
parazyd hace 2 años
padre
commit
6a9f311c99
Se han modificado 3 ficheros con 14 adiciones y 98 borrados
  1. 2 82
      Cargo.lock
  2. 9 13
      Cargo.toml
  3. 3 3
      src/sdk/Cargo.toml

+ 2 - 82
Cargo.lock

@@ -569,21 +569,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 [[package]]
 name = "bitflags"
 name = "bitflags"
 version = "1.3.2"
 version = "1.3.2"
@@ -1793,9 +1778,9 @@ dependencies = [
 
 
 [[package]]
 [[package]]
 name = "dashmap"
 name = "dashmap"
-version = "5.5.1"
+version = "5.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28"
+checksum = "9b101bb8960ab42ada6ae98eb82afcea4452294294c45b681295af26610d6d28"
 dependencies = [
 dependencies = [
  "cfg-if",
  "cfg-if",
  "hashbrown 0.14.0",
  "hashbrown 0.14.0",
@@ -2881,8 +2866,6 @@ dependencies = [
  "halo2_proofs",
  "halo2_proofs",
  "lazy_static",
  "lazy_static",
  "pasta_curves",
  "pasta_curves",
- "plotters",
- "proptest",
  "rand 0.8.5",
  "rand 0.8.5",
  "subtle",
  "subtle",
  "uint",
  "uint",
@@ -2893,7 +2876,6 @@ name = "halo2_proofs"
 version = "0.3.0"
 version = "0.3.0"
 source = "git+https://github.com/parazyd/halo2?branch=v4#397c77cf97e30587d4cdc9676679c6def268daca"
 source = "git+https://github.com/parazyd/halo2?branch=v4#397c77cf97e30587d4cdc9676679c6def268daca"
 dependencies = [
 dependencies = [
- "backtrace",
  "blake2b_simd",
  "blake2b_simd",
  "ff 0.13.0",
  "ff 0.13.0",
  "group 0.13.0",
  "group 0.13.0",
@@ -4077,26 +4059,6 @@ dependencies = [
  "unicode-ident",
  "unicode-ident",
 ]
 ]
 
 
-[[package]]
-name = "proptest"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65"
-dependencies = [
- "bit-set",
- "bitflags 1.3.2",
- "byteorder",
- "lazy_static",
- "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rand_xorshift",
- "regex-syntax 0.6.29",
- "rusty-fork",
- "tempfile",
- "unarray",
-]
-
 [[package]]
 [[package]]
 name = "ptr_meta"
 name = "ptr_meta"
 version = "0.1.4"
 version = "0.1.4"
@@ -4200,12 +4162,6 @@ dependencies = [
  "syn 1.0.109",
  "syn 1.0.109",
 ]
 ]
 
 
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
 [[package]]
 [[package]]
 name = "quote"
 name = "quote"
 version = "1.0.33"
 version = "1.0.33"
@@ -4292,15 +4248,6 @@ dependencies = [
  "rand_core 0.5.1",
  "rand_core 0.5.1",
 ]
 ]
 
 
-[[package]]
-name = "rand_xorshift"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
-dependencies = [
- "rand_core 0.6.4",
-]
-
 [[package]]
 [[package]]
 name = "rayon"
 name = "rayon"
 version = "1.7.0"
 version = "1.7.0"
@@ -4662,18 +4609,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 
-[[package]]
-name = "rusty-fork"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
-dependencies = [
- "fnv",
- "quick-error",
- "tempfile",
- "wait-timeout",
-]
-
 [[package]]
 [[package]]
 name = "ryu"
 name = "ryu"
 version = "1.0.15"
 version = "1.0.15"
@@ -6414,12 +6349,6 @@ dependencies = [
  "static_assertions",
  "static_assertions",
 ]
 ]
 
 
-[[package]]
-name = "unarray"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
-
 [[package]]
 [[package]]
 name = "unicase"
 name = "unicase"
 version = "2.7.0"
 version = "2.7.0"
@@ -6580,15 +6509,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 
-[[package]]
-name = "wait-timeout"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
-dependencies = [
- "libc",
-]
-
 [[package]]
 [[package]]
 name = "waker-fn"
 name = "waker-fn"
 version = "1.1.0"
 version = "1.1.0"

+ 9 - 13
Cargo.toml

@@ -120,21 +120,21 @@ sled-overlay = {version = "0.0.8", optional = true}
 
 
 [dev-dependencies]
 [dev-dependencies]
 clap = {version = "4.4.1", features = ["derive"]}
 clap = {version = "4.4.1", features = ["derive"]}
-halo2_proofs = {version = "0.3.0", features = ["dev-graph", "gadget-traces", "sanity-checks"]}
-halo2_gadgets = {version = "0.3.0", features = ["test-dev-graph", "test-dependencies"]}
+halo2_proofs = {version = "0.3.0", features = ["dev-graph", "sanity-checks"]}
+halo2_gadgets = "0.3.0"
 plotters = "0.3.5"
 plotters = "0.3.5"
 easy-parallel = "3.3.0"
 easy-parallel = "3.3.0"
 prettytable-rs = "0.10.0"
 prettytable-rs = "0.10.0"
 
 
 # -----BEGIN LIBRARY FEATURES-----
 # -----BEGIN LIBRARY FEATURES-----
 [features]
 [features]
-default = []
 async-daemonize = []
 async-daemonize = []
 async-serial = ["darkfi-serial/async"]
 async-serial = ["darkfi-serial/async"]
 
 
 async-sdk = [
 async-sdk = [
     "darkfi-sdk/async",
     "darkfi-sdk/async",
-    "darkfi-serial/async",
+
+    "async-serial",
 ]
 ]
 
 
 blockchain = [
 blockchain = [
@@ -142,9 +142,8 @@ blockchain = [
     "sled",
     "sled",
     "sled-overlay",
     "sled-overlay",
 
 
-    "darkfi-sdk",
-    "darkfi-serial",
-
+    "async-sdk",
+    "async-serial",
     "tx",
     "tx",
     "util",
     "util",
     "zk",
     "zk",
@@ -163,9 +162,7 @@ validator = [
     "sled",
     "sled",
     "url",
     "url",
 
 
-    "darkfi-sdk/async",
-    "darkfi-serial",
-
+    "async-sdk",
     "async-serial",
     "async-serial",
     "blockchain",
     "blockchain",
     "net",
     "net",
@@ -257,10 +254,9 @@ system = [
 tx = [
 tx = [
     "blake3",
     "blake3",
     "rand",
     "rand",
-    
-    "darkfi-sdk",
-    "darkfi-serial",
 
 
+    "async-sdk",
+    "async-serial",
     "zk",
     "zk",
 ]
 ]
 
 

+ 3 - 3
src/sdk/Cargo.toml

@@ -20,7 +20,7 @@ async = ["darkfi-serial/async"]
 thiserror = "1.0.47"
 thiserror = "1.0.47"
 
 
 # Serialization
 # Serialization
-darkfi-serial = {version = "0.4.1", path = "../serial", features = ["derive", "crypto"]}
+darkfi-serial = {path = "../serial", features = ["crypto"]}
 
 
 # Encoding
 # Encoding
 bs58 = "0.5.0"
 bs58 = "0.5.0"
@@ -41,6 +41,6 @@ lazy_static = "1.4.0"
 subtle = "2.5.0"
 subtle = "2.5.0"
 
 
 [dev-dependencies]
 [dev-dependencies]
-halo2_proofs = {version = "0.3.0", features = ["dev-graph", "gadget-traces", "sanity-checks"]}
-halo2_gadgets = {version = "0.3.0", features = ["test-dev-graph", "test-dependencies"]}
+halo2_proofs = {version = "0.3.0", features = ["dev-graph", "sanity-checks"]}
+halo2_gadgets = "0.3.0"
 rand = "0.8.5"
 rand = "0.8.5"