Bump version to 4.7.0

chirpstack/Cargo.toml

@@ -3,7 +3,7 @@ name = "chirpstack"
 description = "ChirpStack is an open-source LoRaWAN(TM) Network Server"
 repository = "https://github.com/chirpstack/chirpstack"
 homepage = "https://www.chirpstack.io/"
-version = "4.7.0-test.4"
+version = "4.7.0"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 edition = "2021"
 publish = false

chirpstack/src/api/application.rs

@@ -1736,7 +1736,7 @@ impl ApplicationService for Application {
                 application::IftttConfiguration {
                     key: req_int.key.clone(),
                     uplink_values: [
-                        req_int.uplink_values.get(0).cloned().unwrap_or_default(),
+                        req_int.uplink_values.first().cloned().unwrap_or_default(),
                         req_int.uplink_values.get(1).cloned().unwrap_or_default(),
                     ],
                     arbitrary_json: req_int.arbitrary_json,
@@ -1820,7 +1820,7 @@ impl ApplicationService for Application {
                 application::IftttConfiguration {
                     key: req_int.key.clone(),
                     uplink_values: [
-                        req_int.uplink_values.get(0).cloned().unwrap_or_default(),
+                        req_int.uplink_values.first().cloned().unwrap_or_default(),
                         req_int.uplink_values.get(1).cloned().unwrap_or_default(),
                     ],
                     arbitrary_json: req_int.arbitrary_json,

chirpstack/src/api/backend/mod.rs

@@ -104,7 +104,7 @@ pub async fn _handle_request(bp: BasePayload, b: Vec<u8>) -> http::Response<hype
                 }
             };
 
-            match joinserver::get(sender_id) {
+            match joinserver::get(sender_id).await {
                 Ok(v) => v,
                 Err(_) => {
                     warn!("Unknown SenderID");

chirpstack/src/backend/joinserver.rs

@@ -1,6 +1,7 @@
-use std::sync::{Arc, RwLock};
+use std::sync::Arc;
 
 use anyhow::Result;
+use tokio::sync::RwLock;
 use tracing::info;
 
 use crate::{config, stream};
@@ -15,7 +16,7 @@ pub async fn setup() -> Result<()> {
     info!("Setting up Join Server clients");
     let conf = config::get();
 
-    let mut clients_w = CLIENTS.write().unwrap();
+    let mut clients_w = CLIENTS.write().await;
     *clients_w = vec![];
 
     for js in &conf.join_server.servers {
@@ -38,8 +39,8 @@ pub async fn setup() -> Result<()> {
     Ok(())
 }
 
-pub fn get(join_eui: EUI64) -> Result<Arc<Client>> {
-    let clients_r = CLIENTS.read().unwrap();
+pub async fn get(join_eui: EUI64) -> Result<Arc<Client>> {
+    let clients_r = CLIENTS.read().await;
     for client in clients_r.iter() {
         if client.0.matches(join_eui) {
             return Ok(client.1.clone());
@@ -53,7 +54,7 @@ pub fn get(join_eui: EUI64) -> Result<Arc<Client>> {
 }
 
 #[cfg(test)]
-pub fn reset() {
-    let mut clients_w = CLIENTS.write().unwrap();
+pub async fn reset() {
+    let mut clients_w = CLIENTS.write().await;
     *clients_w = vec![];
 }

chirpstack/src/certificate.rs

@@ -51,7 +51,7 @@ async fn get_ca_cert(ca_cert_file: &str, ca_key_file: &str) -> Result<Certificat
     let params = CertificateParams::from_ca_cert_pem(&ca_cert_s, ca_key)
         .context("Parse gateway CA certificate")?;
 
-    Ok(Certificate::from_params(params).context("Init Certificate struct")?)
+    Certificate::from_params(params).context("Init Certificate struct")
 }
 
 // This returns the CA, certificate and private-key as PEM encoded strings.

chirpstack/src/downlink/data.rs

@@ -623,7 +623,7 @@ impl Data {
 
         let ds = self.device.get_device_session()?;
 
-        self.mac_commands = filter_mac_commands(&ds, &self.mac_commands);
+        self.mac_commands = filter_mac_commands(ds, &self.mac_commands);
 
         Ok(())
     }

chirpstack/src/integration/loracloud/buffer.rs

@@ -38,8 +38,7 @@ pub async fn get_geoloc_buffer(
         let rx_info: Vec<gw::UplinkRxInfo> = uplink
             .rx_info
             .iter()
-            .cloned()
-            .filter(|rx_info| {
+            .filter(|&rx_info| {
                 let ts: DateTime<Utc> = match &rx_info.gw_time {
                     None => {
                         return false;
@@ -55,6 +54,7 @@ pub async fn get_geoloc_buffer(
                 // The interval between now and then must be smaller than the TTL
                 (ts - Utc::now()) < ttl
             })
+            .cloned()
             .collect();
 
         if rx_info.len() > 3 {

chirpstack/src/integration/mqtt.rs

@@ -134,7 +134,7 @@ impl<'a> Integration<'a> {
                     command: r"(?P<command>[\w]+)".to_string(),
                 },
             )?)?,
-            qos: qos,
+            qos,
             json: conf.json,
             client,
             templates,

chirpstack/src/storage/metrics.rs

@@ -119,7 +119,7 @@ pub async fn save(name: &str, record: &Record) -> Result<()> {
                 .unwrap(),
         };
 
-        let key = get_key(&name, a, ts);
+        let key = get_key(name, a, ts);
 
         for (k, v) in &record.metrics {
             // Passing a reference to hincr will return a runtime error.

chirpstack/src/storage/user.rs

@@ -119,7 +119,7 @@ pub async fn get_by_email_and_pw(email: &str, pw: &str) -> Result<User, Error> {
         }
     };
 
-    if verify_password(&pw, &u.password_hash) {
+    if verify_password(pw, &u.password_hash) {
         return Ok(u);
     }
 

chirpstack/src/stream/event.rs

@@ -112,7 +112,7 @@ async fn handle_stream(
     k: &str,
     v: &redis::Value,
 ) -> Result<()> {
-    match k.as_ref() {
+    match k {
         "up" => {
             trace!(key = %k, id = %stream_id, "Event-log received from stream");
             if let redis::Value::Data(b) = v {

chirpstack/src/stream/frame.rs

@@ -276,7 +276,7 @@ async fn handle_stream(
     k: &str,
     v: &redis::Value,
 ) -> Result<()> {
-    match k.as_ref() {
+    match k {
         "up" => {
             trace!(key = %k, id = %stream_id, "Frame-log received from stream");
             if let redis::Value::Data(b) = v {

chirpstack/src/test/class_a_pr_test.rs

@@ -167,7 +167,7 @@ async fn test_fns_uplink() {
     sns_pr_start_req_mock.assert();
     sns_pr_start_req_mock.delete();
 
-    joinserver::reset();
+    joinserver::reset().await;
 }
 
 #[tokio::test]

chirpstack/src/test/otaa_pr_test.rs

@@ -246,7 +246,7 @@ async fn test_fns() {
     })()
     .await;
 
-    joinserver::reset();
+    joinserver::reset().await;
 }
 
 #[tokio::test]
@@ -430,7 +430,7 @@ async fn test_sns() {
         pr_start_ans
     );
 
-    joinserver::reset();
+    joinserver::reset().await;
 }
 
 #[tokio::test]
@@ -588,5 +588,5 @@ async fn test_sns_roaming_not_allowed() {
         pr_start_ans
     );
 
-    joinserver::reset();
+    joinserver::reset().await;
 }

chirpstack/src/uplink/data.rs

@@ -215,7 +215,7 @@ impl Data {
         let mac = if let lrwn::Payload::MACPayload(pl) = &self.phy_payload.payload {
             pl
         } else {
-            return Err(Error::AnyhowError(anyhow!("Expected MacPayload")));
+            return Err(Error::Anyhow(anyhow!("Expected MacPayload")));
         };
 
         if roaming::is_roaming_dev_addr(mac.fhdr.devaddr) {
@@ -234,7 +234,7 @@ impl Data {
         let dev_addr = if let lrwn::Payload::MACPayload(pl) = &self.phy_payload.payload {
             pl.fhdr.devaddr
         } else {
-            return Err(Error::AnyhowError(anyhow!("No MacPayload in PhyPayload")));
+            return Err(Error::Anyhow(anyhow!("No MacPayload in PhyPayload")));
         };
 
         match device::get_for_phypayload_and_incr_f_cnt_up(
@@ -277,7 +277,7 @@ impl Data {
                     return Err(Error::Abort);
                 }
                 _ => {
-                    return Err(Error::AnyhowError(
+                    return Err(Error::Anyhow(
                         anyhow::Error::new(e).context("Get device-session"),
                     ));
                 }
@@ -295,7 +295,7 @@ impl Data {
         let dev_addr = if let lrwn::Payload::MACPayload(pl) = &self.phy_payload.payload {
             pl.fhdr.devaddr
         } else {
-            return Err(Error::AnyhowError(anyhow!("No MacPayload in PhyPayload")));
+            return Err(Error::Anyhow(anyhow!("No MacPayload in PhyPayload")));
         };
 
         let dr = relay_ctx.req.metadata.dr;
@@ -334,7 +334,7 @@ impl Data {
                     return Err(Error::Abort);
                 }
                 _ => {
-                    return Err(Error::AnyhowError(
+                    return Err(Error::Anyhow(
                         anyhow::Error::new(e).context("Get device-session"),
                     ));
                 }

chirpstack/src/uplink/error.rs

@@ -9,5 +9,5 @@ pub enum Error {
     RoamingIsNotAllowed,
 
     #[error(transparent)]
-    AnyhowError(#[from] anyhow::Error),
+    Anyhow(#[from] anyhow::Error),
 }

chirpstack/src/uplink/helpers.rs

@@ -136,8 +136,8 @@ pub fn get_time_since_gps_epoch_chrono(rx_info: &[gw::UplinkRxInfo]) -> Option<c
 pub fn get_start_location(rx_info: &[gw::UplinkRxInfo]) -> Option<common::Location> {
     let mut with_loc: Vec<gw::UplinkRxInfo> = rx_info
         .iter()
+        .filter(|&i| i.location.is_some())
         .cloned()
-        .filter(|i| i.location.is_some())
         .collect();
     with_loc.sort_by(|a, b| a.snr.partial_cmp(&b.snr).unwrap());
     with_loc

chirpstack/src/uplink/join.rs

@@ -258,7 +258,7 @@ impl JoinRequest {
 
         if self.device_keys.is_none() {
             trace!(join_eui = %jr.join_eui, "Getting Join Server client");
-            self.js_client = Some(joinserver::get(jr.join_eui)?);
+            self.js_client = Some(joinserver::get(jr.join_eui).await?);
         }
 
         Ok(())

chirpstack/src/uplink/join_fns.rs

@@ -58,7 +58,7 @@ impl JoinRequest {
         trace!("Getting home netid");
 
         trace!(join_eui = %self.join_request.join_eui, "Trying to get join-server client");
-        let js_client = joinserver::get(self.join_request.join_eui)?;
+        let js_client = joinserver::get(self.join_request.join_eui).await?;
 
         let mut home_ns_req = backend::HomeNSReqPayload {
             dev_eui: self.join_request.dev_eui.to_vec(),

chirpstack/src/uplink/join_sns.rs

@@ -162,7 +162,7 @@ impl JoinRequest {
 
         if self.device_keys.is_none() {
             trace!(join_eui = %jr.join_eui, "Getting Join Server client");
-            self.js_client = Some(joinserver::get(jr.join_eui)?);
+            self.js_client = Some(joinserver::get(jr.join_eui).await?);
         }
 
         Ok(())

chirpstack/src/uplink/mod.rs

@@ -248,7 +248,7 @@ async fn deduplicate_put(
 async fn deduplicate_collect(key: &str) -> Result<gw::UplinkFrameSet> {
     let items_b: Vec<Vec<u8>> = {
         redis::cmd("SMEMBERS")
-            .arg(&key)
+            .arg(key)
             .query_async(&mut get_async_redis_conn().await?)
             .await
             .context("Deduplication collect")?
@@ -285,7 +285,7 @@ async fn deduplicate_collect(key: &str) -> Result<gw::UplinkFrameSet> {
 pub async fn handle_uplink(deduplication_id: Uuid, uplink: gw::UplinkFrameSet) -> Result<()> {
     let rx_info = &uplink
         .rx_info
-        .get(0)
+        .first()
         .context("Unable to get first item from rx_info")?;
 
     let region_config_id = rx_info