Clean code

.github/workflows/build.yml

@@ -7,16 +7,6 @@ on:
 name: Build
 
 jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Run cargo check
-        run: cargo check
-
   test:
     name: Test Suite
     runs-on: ubuntu-latest
@@ -44,7 +34,7 @@ jobs:
           path: target/nextest/ci/*.xml
           reporter: java-junit
           max-annotations: 50
-          name: Unit Tests
+          name: Test Suite Summary
   lints:
     name: Lints
     runs-on: ubuntu-latest
@@ -65,8 +55,6 @@ jobs:
       CARGO_TERM_COLOR: always
     steps:
       - uses: actions/checkout@v4
-      - name: Update Rust
-        run: rustup update stable
       - uses: taiki-e/install-action@cargo-llvm-cov
       - uses: taiki-e/install-action@nextest
       - name: Generate code coverage
@@ -76,12 +64,3 @@ jobs:
         with:          
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
-# this is needed by zgosalvez/github-actions-report-lcov
-      - name: Setup LCOV
-        uses: hrishikesh-kadam/setup-lcov@v1
-      - name: Report code coverage
-        uses: zgosalvez/github-actions-report-lcov@v4
-        with:
-          coverage-files: lcov.info
-          artifact-name: code-coverage-report
-          update-comment: true

src/mitaffald/mod.rs

@@ -8,7 +8,7 @@
 use self::settings::{AddressId, TraditionalAddress};
 
 pub async fn get_containers(config: AffaldVarmeConfig) -> Result<Vec<Container>, String> {
-    let response = fetch_remote_response(config).await?;
+    let response = fetch_collection_plan(config).await?;
 
     if !response.status().is_success() {
         return Err(format!("Unexpected status code: {:?}", response.status()));
@@ -53,7 +53,7 @@
     fractions: Vec<String>,
 }
 
-async fn fetch_remote_response(config: AffaldVarmeConfig) -> Result<reqwest::Response, String> {
+async fn fetch_collection_plan(config: AffaldVarmeConfig) -> Result<reqwest::Response, String> {
     let remote_url = build_remote_url(config).await?;
 
     reqwest::get(remote_url)
@@ -105,7 +105,9 @@
                 .and_then(|x| x.as_str())
                 .map(|x| AddressId { id: x.to_owned() })
         })
-        .ok_or_else(|| "Address not found".to_string())
+        .ok_or_else(|| {
+            "Address not found or multiple addresses matched the search criteria".to_string()
+        })
 }
 
 #[derive(Debug, PartialEq)]

tests/full_flow_insta.rs

@@ -47,8 +47,8 @@ async fn smoke_test_insta() {
         },
     };
 
-    let mut collecting_client = CollectingClient::new();
-    collecting_client.start(&settings.mqtt);
+    let mut home_assistant = CollectingClient::new();
+    home_assistant.start(&settings.mqtt);
 
     let sync_result = sync_data(settings).await;
 
@@ -58,17 +58,17 @@ async fn smoke_test_insta() {
         sync_result.err()
     );
 
-    let collect_result = collecting_client.wait_for_messages(20, Duration::from_secs(60));
+    let ha_messages_result = home_assistant.wait_for_messages(20, Duration::from_secs(60));
 
     assert!(
-        collect_result.is_ok(),
+        ha_messages_result.is_ok(),
         "Error waiting for messages: {}",
-        collect_result.unwrap_err()
+        ha_messages_result.unwrap_err()
     );
 
     mit_affald_server.assert_async().await;
 
-    let actual = actual(collect_result.unwrap());
+    let actual = actual(ha_messages_result.unwrap());
 
     insta::with_settings!({
         filters=>vec![