From f91a470d1aa2bf004e8aa2ee5a12393b0d850e17 Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@pandoracore.com>
Date: Sun, 20 Mar 2022 10:40:04 +0100
Subject: [PATCH] Test CI with nightly, fix missed tests

---
 .github/workflows/test.yml |  6 +++---
 Cargo.lock                 | 24 +++---------------------
 scripts/Cargo.toml         |  2 +-
 scripts/src/parser.rs      |  2 +-
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 55d8989..6470480 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,16 +14,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install latest stable
+      - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: nightly
           override: true
       - name: Test main lib
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --all-features --no-fail-fast
+          args: --workspace --all-features --all-targets --no-fail-fast
       - name: Test slip132
         uses: actions-rs/cargo@v1
         with:
diff --git a/Cargo.lock b/Cargo.lock
index f073603..06919b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -134,7 +134,7 @@ dependencies = [
  "base64-compat",
  "bech32",
  "bitcoin_hashes 0.10.0",
- "secp256k1 0.21.3",
+ "secp256k1",
  "serde",
 ]
 
@@ -187,7 +187,7 @@ dependencies = [
  "amplify",
  "bitcoin",
  "miniscript",
- "secp256k1 0.22.1",
+ "secp256k1",
  "serde",
  "serde_with",
  "strict_encoding",
@@ -892,19 +892,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260"
 dependencies = [
  "rand 0.6.5",
- "secp256k1-sys 0.4.2",
+ "secp256k1-sys",
  "serde",
 ]
 
-[[package]]
-name = "secp256k1"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0"
-dependencies = [
- "secp256k1-sys 0.5.0",
-]
-
 [[package]]
 name = "secp256k1-sys"
 version = "0.4.2"
@@ -914,15 +905,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "secp256k1-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b5b9d7322572e1f3aeed208668ce87789b3645dbb73082c5ce99a004103a35"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "serde"
 version = "1.0.136"
diff --git a/scripts/Cargo.toml b/scripts/Cargo.toml
index 1e56b59..10c8838 100644
--- a/scripts/Cargo.toml
+++ b/scripts/Cargo.toml
@@ -21,7 +21,7 @@ serde_crate = { package = "serde", version = "1", features = ["derive"], optiona
 serde_with = { version = "1.8", optional = true }
 
 [dev-dependencies]
-secp256k1 = { version = "0.22.0", features = ["global-context-less-secure"] }
+secp256k1 = { version = "0.21.2", features = ["global-context"] }
 
 [features]
 default = []
diff --git a/scripts/src/parser.rs b/scripts/src/parser.rs
index 89bce8c..2477021 100644
--- a/scripts/src/parser.rs
+++ b/scripts/src/parser.rs
@@ -187,7 +187,7 @@ pub(crate) mod test {
     pub(crate) fn gen_bitcoin_pubkeys(n: usize, compressed: bool) -> Vec<bitcoin::PublicKey> {
         gen_secp_pubkeys(n)
             .into_iter()
-            .map(|key| bitcoin::PublicKey { key, compressed })
+            .map(|inner| bitcoin::PublicKey { inner, compressed })
             .collect()
     }