Merge 45dcc2a into 56bc210

ergoplatform · Sep 30, 2020 · 1ce1192 · 1ce1192
2 parents 56bc210 + 45dcc2a
commit 1ce1192
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 57 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -85,11 +85,11 @@ matrix:
         - xcodebuild -project ./ErgoWallet.xcodeproj -xcconfig ./Config/Release.xcconfig -sdk iphoneos
         - xcodebuild -project ./ErgoWallet.xcodeproj -xcconfig ./Config/Release.xcconfig -sdk iphonesimulator
 
-    - name: test sigma-tree with default features
+    - name: test sigma-tree without default features
       rust: stable
       script:
         - cd sigma-tree
-        - cargo test --verbose
+        - cargo build --no-default-features
 
 
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -6,5 +6,4 @@ members = [
     "bindings/ergo-wallet-lib-c-core",
     "bindings/ergo-wallet-lib-c",
     "bindings/ergo-wallet-lib-android",
-    "sigma-testutil",
 ]
diff --git a/bindings/ergo-wallet-lib-wasm/Cargo.toml b/bindings/ergo-wallet-lib-wasm/Cargo.toml
@@ -16,7 +16,7 @@ serde = { version = "1.0", features = ["derive"]}
 serde_json = "1.0"
 js-sys = "0.3"
 
-sigma-tree = { path = "../../sigma-tree", features = ["with-serde"] }
+sigma-tree = { path = "../../sigma-tree" }
 # used in elliptic-curve(in sigma-tree), compiled here with WASM support
 getrandom = {version = "0.1", features = ["wasm-bindgen"]}
 # The `console_error_panic_hook` crate provides better debugging of panics by
@@ -32,7 +32,6 @@ features = ["serde-serialize"]
 [dev-dependencies]
 wasm-bindgen-test = "0.3.10"
 proptest-derive = "0.2"
-sigma-testutil = { path = "../../sigma-testutil" }
 
 [dev-dependencies.proptest]
 # wasm support, via https://altsysrq.github.io/proptest-book/proptest/wasm.html

diff --git a/sigma-testutil/Cargo.toml b/sigma-testutil/Cargo.toml
diff --git a/sigma-testutil/src/generator.rs b/sigma-testutil/src/generator.rs
diff --git a/sigma-testutil/src/lib.rs b/sigma-testutil/src/lib.rs
diff --git a/sigma-tree/Cargo.toml b/sigma-tree/Cargo.toml
@@ -21,18 +21,13 @@ bs58 = "0.3.1"
 num-bigint = "0.3.0"
 rand = "0.7"
 
-[dependencies.num-traits]
-version = "0.2"
-default-features = false
-
 [features]
-default = []
+default = ["with-serde"]
 with-serde = ["serde"]
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.10"
 proptest-derive = "0.2"
-# sigma-testutil = { path = "../sigma-testutil"}
 rand = "0.7.3"
 
 [dev-dependencies.proptest]