Merge branch 'develop' of https://github.com/stacks-network/stacks-core into feat/ignore-old-proposals-node

Author: jferrant

.github/workflows/clippy.yml

@@ -0,0 +1,40 @@
+## Perform Clippy checks - currently set to defaults
+##   https://github.com/rust-lang/rust-clippy#usage
+##   https://rust-lang.github.io/rust-clippy/master/index.html
+##
+name: Clippy Checks
+
+# Only run when:
+#   - PRs are (re)opened against develop branch
+on:
+  pull_request:
+    branches:
+      - develop
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+jobs:
+  clippy_check:
+    name: Clippy Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        id: git_checkout
+        uses: actions/checkout@v3
+      - name: Define Rust Toolchain
+        id: define_rust_toolchain
+        run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
+      - name: Setup Rust Toolchain
+        id: setup_rust_toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+          components: clippy
+      - name: Clippy
+        id: clippy
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: -p libstackerdb -p stacks-signer -p pox-locking --no-deps --tests --all-features -- -D warnings

.github/workflows/stacks-core-tests.yml

@@ -18,55 +18,6 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
-  # Full genesis test with code coverage
-  full-genesis:
-    name: Full Genesis Test
-    runs-on: ubuntu-latest
-    strategy:
-      ## Continue with the test matrix even if we've had a failure
-      fail-fast: false
-      ## Run a maximum of 2 concurrent tests from the test matrix
-      max-parallel: 2
-      matrix:
-        test-name:
-          - neon_integrations::bitcoind_integration_test
-    steps:
-      ## Setup test environment
-      - name: Setup Test Environment
-        id: setup_tests
-        uses: stacks-network/actions/stacks-core/testenv@main
-        with:
-          genesis: true
-          btc-version: "25.0"
-
-      ## Run test matrix using restored cache of archive file
-      ##   - Test will timeout after env.TEST_TIMEOUT minutes
-      - name: Run Tests
-        id: run_tests
-        timeout-minutes: ${{ fromJSON(env.TEST_TIMEOUT) }}
-        uses: stacks-network/actions/stacks-core/run-tests@main
-        with:
-          test-name: ${{ matrix.test-name }}
-          threads: 1
-          archive-file: ~/genesis_archive.tar.zst
-
-      ## Upload code coverage file
-      - name: Code Coverage
-        id: codecov
-        uses: stacks-network/actions/codecov@main
-        with:
-          test-name: large_genesis
-          filename: ./lcov.info
-
-      - name: Status Output
-        run: |
-          echo "run_tests: ${{ steps.run_tests.outputs.status }}"
-          echo "codecov: ${{ steps.codecov.outputs.status }}"
-
-      - name: Check Failures
-        if: steps.run_tests.outputs.status == 'failure' || steps.codecov.outputs.status == 'failure'
-        run: exit 1
-
   # Unit tests with code coverage
   unit-tests:
     name: Unit Tests
@@ -186,7 +137,6 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     needs:
-      - full-genesis
       - open-api-validation
       - core-contracts-clarinet-test
     steps:

stacks-signer/src/chainstate.rs

@@ -176,7 +176,7 @@ enum ProposedBy<'a> {
     CurrentSortition(&'a SortitionState),
 }
 
-impl<'a> ProposedBy<'a> {
+impl ProposedBy<'_> {
     pub fn state(&self) -> &SortitionState {
         match self {
             ProposedBy::LastSortition(x) => x,

stacks-signer/src/cli.rs

@@ -41,11 +41,9 @@ use stacks_common::types::chainstate::StacksPrivateKey;
 
 extern crate alloc;
 
-#[derive(Parser, Debug)]
-#[command(author, version, about)]
-#[command(long_version = VERSION_STRING.as_str())]
-
 /// The CLI arguments for the stacks signer
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_version = VERSION_STRING.as_str())]
 pub struct Cli {
     /// Subcommand action to take
     #[command(subcommand)]