From d88e19d54a1860bdbcbf7b2cd3db4b34dc862eea Mon Sep 17 00:00:00 2001
From: shuimuliang <shuimuliang@gmail.com>
Date: Mon, 23 Oct 2023 22:40:36 +0800
Subject: [PATCH] fix: according to the comments in pr7

---
 .github/workflows/lint-pr.yml |  4 ----
 .github/workflows/rust.yaml   |  2 +-
 .gitignore                    |  7 +------
 Cargo.lock                    | 14 ++++++++++++--
 Cargo.toml                    |  2 +-
 rust-toolchain.toml           |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
index d96fccc..62c9198 100644
--- a/.github/workflows/lint-pr.yml
+++ b/.github/workflows/lint-pr.yml
@@ -17,7 +17,3 @@ jobs:
       pull-requests: read  # for amannn/action-semantic-pull-request to analyze PRs
       statuses: write  # for amannn/action-semantic-pull-request to mark status of analyzed PR
     runs-on: ubuntu-latest
-    steps:
-      - uses: amannn/action-semantic-pull-request@v5.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
index f553a2f..509c4f0 100644
--- a/.github/workflows/rust.yaml
+++ b/.github/workflows/rust.yaml
@@ -21,7 +21,7 @@ jobs:
         with:
           components: clippy
       - name: Lint
-        run: cargo clippy --workspace --all-targets --tests -- -D warnings
+        run: cargo clippy --all-targets --all-features -- -D warnings
 
   format:
     runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
index 4ae78ec..9c862ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,13 +7,8 @@
 /tmp
 
 # will have compiled files and executables
-debug/
 /target
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
@@ -26,4 +21,4 @@ Cargo.lock
 
 # MaxOS files
 .DS_Store
-*.swp
\ No newline at end of file
+*.swp
diff --git a/Cargo.lock b/Cargo.lock
index 642c2db..aff3dd3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -587,7 +587,7 @@ dependencies = [
  "getrandom",
  "js-sys",
  "log",
- "miniscript",
+ "miniscript 9.0.2",
  "rand",
  "serde",
  "serde_json",
@@ -2442,6 +2442,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "miniscript"
+version = "8.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5f536c4b9b0868b37f4fb276758831fa93401f1fadc03447607f06ef4c72ee1"
+dependencies = [
+ "bitcoin 0.29.2",
+ "serde",
+]
+
 [[package]]
 name = "miniscript"
 version = "9.0.2"
@@ -3312,7 +3322,7 @@ dependencies = [
  "lightning-rapid-gossip-sync 0.0.115 (registry+https://github.com/rust-lang/crates.io-index)",
  "magic-crypt",
  "mime",
- "miniscript",
+ "miniscript 8.0.2",
  "once_cell",
  "rand",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index d52f4b8..4ed6819 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ lightning-net-tokio = { version = "0.0.115" }
 lightning-persister = { version = "0.0.115", path = "./rust-lightning/lightning-persister" }
 lightning-rapid-gossip-sync = { version = "0.0.115" }
 magic-crypt = "3.1.12"
-miniscript = { version = "9.0.1", features = ["serde"] }
+miniscript = { version = "8.0", features = ["serde"] }
 rand = "0.8.5"
 reqwest = { version = "0.11", default-features = false, features = ["json", "multipart", "native-tls", "stream"] }
 scrypt = "0.11.0"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 1cb7422..f7b1400 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly"
+channel = "stable"
 components = ["clippy", "rustfmt"]
 targets = []
 profile = "minimal"