ci(speculos): set version to sha-f430e51, fix clippy

bitcoindevkit · Jun 3, 2024 · 7e74055 · 7e74055
1 parent c50a409
commit 7e74055
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -40,12 +40,12 @@ jobs:
     strategy:
       matrix:
         rust:
-          - version: stable # STABLE
-            features: miniscript
+#          - version: stable # STABLE
+#            features: miniscript
           - version: 1.63.0 # MSRV
             features: miniscript
         emulator:
-          - name: trezor
+          # - name: trezor
           - name: ledger
     steps:
       - name: Checkout
@@ -58,19 +58,23 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: ci/
-          file: ci/Dockerfile.${{ matrix.emulator.name }}
-          tags: hwi/${{ matrix.emulator.name }}_emulator:latest
-          load: true
-          cache-from: type=gha
-          cache-to: type=gha
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v2
+      - name: Build simulator image
+        run: docker build -t hwi/${{ matrix.emulator.name }}_emulator:latest ./ci -f ci/Dockerfile.${{ matrix.emulator.name }}
       - name: Run simulator image
         run: docker run --name simulator --network=host hwi/${{ matrix.emulator.name }}_emulator &
+#      - name: Build and push
+#        uses: docker/build-push-action@v3
+#        with:
+#          context: ci/
+#          file: ci/Dockerfile.${{ matrix.emulator.name }}
+#          tags: hwi/${{ matrix.emulator.name }}_emulator:latest
+#          load: true
+#          cache-from: type=gha
+#          cache-to: type=gha
+#      - name: Run simulator image
+#        run: docker run --name simulator --network=host hwi/${{ matrix.emulator.name }}_emulator &
       - name: Install Python
         uses: actions/setup-python@v4
         with:

diff --git a/ci/Dockerfile.ledger b/ci/Dockerfile.ledger
@@ -1,4 +1,4 @@
-FROM ghcr.io/ledgerhq/speculos
+FROM ghcr.io/ledgerhq/speculos:sha-f430e51
 
 RUN apt-get update
 RUN apt-get install wget -y

diff --git a/clippy.toml b/clippy.toml
@@ -1 +1 @@
-msrv="1.48.0"
+msrv="1.63.0"
diff --git a/src/lib.rs b/src/lib.rs
@@ -59,7 +59,7 @@ mod tests {
     #[serial]
     fn test_enumerate() {
         let devices = HWIClient::enumerate().unwrap();
-        assert!(devices.len() > 0);
+        assert!(!devices.is_empty());
     }
 
     #[test]
@@ -83,7 +83,7 @@ mod tests {
             .expect("No devices found. Either plug in a hardware wallet, or start a simulator.")
             .as_ref()
             .expect("Error when opening the first device");
-        HWIClient::get_client(&device, true, TESTNET).unwrap()
+        HWIClient::get_client(device, true, TESTNET).unwrap()
     }
 
     #[test]
@@ -119,8 +119,8 @@ mod tests {
         let client = get_first_device();
         let account = Some(10);
         let descriptor = client.get_descriptors::<String>(account).unwrap();
-        assert!(descriptor.internal.len() > 0);
-        assert!(descriptor.receive.len() > 0);
+        assert!(!descriptor.internal.is_empty());
+        assert!(!descriptor.receive.is_empty());
     }
 
     #[test]
@@ -141,8 +141,8 @@ mod tests {
         let descriptor = client
             .get_descriptors::<Descriptor<DescriptorPublicKey>>(account)
             .unwrap();
-        assert!(descriptor.internal.len() > 0);
-        assert!(descriptor.receive.len() > 0);
+        assert!(!descriptor.internal.is_empty());
+        assert!(!descriptor.receive.is_empty());
     }
 
     #[test]
@@ -199,7 +199,7 @@ mod tests {
     fn test_sign_tx() {
         let devices = HWIClient::enumerate().unwrap();
         let device = devices.first().unwrap().as_ref().unwrap();
-        let client = HWIClient::get_client(&device, true, TESTNET).unwrap();
+        let client = HWIClient::get_client(device, true, TESTNET).unwrap();
         let derivation_path = DerivationPath::from_str("m/44'/1'/0'/0/0").unwrap();
 
         let address = client
@@ -237,7 +237,7 @@ mod tests {
                 input: vec![previous_txin],
                 output: vec![TxOut {
                     value: Amount::from_sat(50),
-                    script_pubkey: script_pubkey,
+                    script_pubkey,
                 }],
             },
             xpub: Default::default(),