fix: remove redundant feature gate

test: add signing to internal-tests matrix test: add signing as msrv matrix option
mavlink · Aug 25, 2024 · 614cd28 · 614cd28
1 parent 552560b
commit 614cd28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,11 +30,12 @@ jobs:
     strategy:
         matrix:
           dialect: ["ardupilotmega", "asluav", "matrixpilot", "minimal", "paparazzi", "python_array_test", "slugs", "standard", "test", "ualberta", "uavionix", "icarous", "common"]
+          signing: ["", "--features signing"]
     steps:
       - uses: actions/checkout@master
       - uses: dtolnay/rust-toolchain@stable
       - name: Run internal tests
-        run: cargo test --verbose --features ${{ matrix.dialect }} --features signing -- --nocapture
+        run: cargo test --verbose --features ${{ matrix.dialect }} ${{ matrix.signing }} -- --nocapture
 
   mavlink-dump:
     runs-on: ubuntu-latest
@@ -46,6 +47,9 @@ jobs:
 
   msrv:
     runs-on: ubuntu-latest
+    strategy:
+      matrix: 
+        signing: ["", "--features signing"]
     steps:
       - uses: actions/checkout@master
       - uses: dtolnay/rust-toolchain@master
@@ -59,7 +63,7 @@ jobs:
         with:
           use-cross: true
           command: check
-          args: --all --all-targets --features signing
+          args: --all --all-targets ${{ matrix.signing }}
 
   build:
     needs: [formatting, linting, internal-tests, mavlink-dump, msrv]

diff --git a/mavlink-core/src/connection/udp.rs b/mavlink-core/src/connection/udp.rs
@@ -166,16 +166,13 @@ impl<M: Message> MavConnection<M> for UdpConnection {
                 self.protocol_version,
                 header,
                 data,
-                #[cfg(feature = "signing")]
-                self.signing_data.as_ref(),
             )?;
             #[cfg(feature = "signing")]
             write_versioned_msg_signed(
                 &mut buf,
                 self.protocol_version,
                 header,
                 data,
-                #[cfg(feature = "signing")]
                 self.signing_data.as_ref(),
             )?;
             state.socket.send_to(&buf, addr)?