Merge pull request openwsn-berkeley#194 from geonnave/remove-legacy-e…

…ad-zeroconf-crate

Remove legacy zeroconf crate

.github/workflows/build-and-test.yml

@@ -44,14 +44,14 @@ jobs:
       fail-fast: false
       matrix:
         crypto_backend: [lakers-crypto/hacspec, lakers-crypto/psa, lakers-crypto/rustcrypto]
-        ead: [ead-none, ead-zeroconf]
+        ead: [ead-none, ead-authz]
 
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
 
-    - name: Run unit tests with feature matrix # note that we only add `--package lakers-ead-zeroconf` when testing with that config
-      run: RUST_BACKTRACE=1 cargo test -p lakers -p lakers-crypto -p lakers-shared ${{ matrix.ead == 'ead-zeroconf' && '-p lakers-ead-zeroconf' || '' }}  --no-default-features --features="${{ matrix.crypto_backend }}, ${{ matrix.ead }}" --no-fail-fast -- --test-threads 1
+    - name: Run unit tests with feature matrix # note that we only add `--package lakers-ead-authz` when testing with that config
+      run: RUST_BACKTRACE=1 cargo test -p lakers -p lakers-crypto -p lakers-shared ${{ matrix.ead == 'ead-authz' && '-p lakers-ead-authz' || '' }}  --no-default-features --features="${{ matrix.crypto_backend }}, ${{ matrix.ead }}" --no-fail-fast -- --test-threads 1
 
 
   build-edhoc-package:
@@ -62,7 +62,7 @@ jobs:
       fail-fast: false
       matrix:
         crypto_backend: [lakers-crypto/hacspec, lakers-crypto/psa, lakers-crypto/psa-baremetal, lakers-crypto/cryptocell310, lakers-crypto/rustcrypto]
-        ead: [ead-none, ead-zeroconf]
+        ead: [ead-none, ead-authz]
 
     steps:
     - name: Checkout repo
@@ -113,7 +113,7 @@ jobs:
       fail-fast: false
       matrix:
         crypto_backend: [crypto-psa]
-        ead: [ead-none, ead-zeroconf]
+        ead: [ead-none, ead-authz]
 
     steps:
     - name: Checkout repo
@@ -138,7 +138,7 @@ jobs:
       fail-fast: false
       matrix:
         crypto_backend: [crypto-psa, crypto-cryptocell310]
-        ead: [ead-none, ead-zeroconf]
+        ead: [ead-none, ead-authz]
 
     steps:
     - name: Checkout repo

Cargo.toml

@@ -3,8 +3,6 @@
 members = [
   "lib",
   "ead",
-  "ead/lakers-ead-none",
-  "ead/lakers-ead-zeroconf",
   "ead/lakers-ead-authz",
   "crypto",
   "crypto/lakers-crypto-cc2538",
@@ -44,8 +42,6 @@ readme = "shared/README.md"
 
 lakers-shared = { package = "lakers-shared", path = "shared/", version = "^0.4.1" }
 lakers-ead = { package = "lakers-ead-dispatch", path = "ead/", version = "^0.4.1", default-features = false }
-lakers-ead-none = { package = "lakers-ead-none", path = "ead/lakers-ead-none/", version = "^0.4.1" }
-lakers-ead-zeroconf = { package = "lakers-ead-zeroconf", path = "ead/lakers-ead-zeroconf/", version = "^0.4.1" }
 lakers-ead-authz = { package = "lakers-ead-authz", path = "ead/lakers-ead-authz/", version = "^0.4.1" }
 lakers-crypto = { path = "crypto/" }
 

ead/Cargo.toml

@@ -11,12 +11,9 @@ readme.workspace = true
 [dependencies]
 lakers-shared.workspace = true
 
-lakers-ead-none = { workspace = true, optional = true }
-lakers-ead-zeroconf = { workspace = true, optional = true }
 lakers-ead-authz = { workspace = true, optional = true }
 
 [features]
 default = [ "ead-none" ]
-ead-none = [ "lakers-ead-none" ]
-ead-zeroconf = [ "lakers-ead-zeroconf" ]
+ead-none = [  ]
 ead-authz = [ "lakers-ead-authz" ]

ead/lakers-ead-authz/src/lib.rs

@@ -74,11 +74,11 @@ mod test_authz {
             Some(ACL_INVALID_TV.try_into().unwrap()),
         );
 
-        let (ead_1, mut device) =
+        let (mut device, ead_1) =
             device.prepare_ead_1(&mut default_crypto(), G_XW_TV.try_into().unwrap(), SS_TV);
         device.set_h_message_1(H_MESSAGE_1_TV.try_into().unwrap());
 
-        let (_loc_w, voucher_request, _authenticator) = authenticator
+        let (_authenticator, _loc_w, voucher_request) = authenticator
             .process_ead_1(&ead_1, &MESSAGE_1_WITH_EAD_TV.try_into().unwrap())
             .unwrap();