Merge pull request #388 from helium/madninja/remove_subnet

Remove subnet, fix base64

Makefile.toml

@@ -2,7 +2,7 @@
 CROSS_TARGET = "${CARGO_MAKE_PROFILE}"
 FEATURES = "ecc608"
 BUILD_COMMAND = "cross"
-TAR = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "linux", mapping = {"macos" = "gtar", "linux" = "tar" } }
+TAR = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "linux", mapping = { macos = "gtar", linux = "tar" } }
 
 [env.x86_64-tpm-debian-gnu]
 CROSS_TARGET = "x86_64-unknown-linux-gnu"

lorawan/Cargo.toml

@@ -10,4 +10,4 @@ byteorder = {workspace = true}
 bitfield = "0.13"
 
 [dev-dependencies]
-base64 = "0"
+base64 = ">=0.21"

lorawan/src/lib.rs

@@ -4,7 +4,6 @@ use std::{convert::From, fmt, io, mem::size_of, result};
 
 pub mod error;
 pub use error::LoraWanError;
-pub mod subnet;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Direction {
@@ -524,7 +523,10 @@ mod test {
 
     #[test]
     fn test_read_write_roundtrip() {
-        let data_a = base64::decode("IL1ciMu7b3ZOP5Q1cBA7isI=").unwrap();
+        use base64::Engine;
+        let data_a = base64::engine::general_purpose::STANDARD
+            .decode("IL1ciMu7b3ZOP5Q1cBA7isI=")
+            .unwrap();
         let payload_a = PHYPayload::read(Direction::Uplink, &mut &data_a[..]).unwrap();
         let mut data_b = Vec::with_capacity(data_a.len());
         payload_a.write(&mut data_b).unwrap();