From 09f3190638bd150a09e5ca1c0bbfbf18f4d3f6d2 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 2 Oct 2024 09:49:51 -0700 Subject: [PATCH] update for data only proto branch --- Cargo.lock | 61 +++++++++++++++++++++++++--------------- helium-lib/src/client.rs | 1 + 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8089bf55..e150a065 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -692,7 +692,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools 0.10.5", + "itertools", "num-traits", "zeroize", ] @@ -709,7 +709,7 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools 0.10.5", + "itertools", "num-bigint 0.4.5", "num-traits", "paste", @@ -2627,7 +2627,7 @@ dependencies = [ "bs58 0.5.1", "byteorder", "ed25519-compact", - "getrandom 0.2.15", + "getrandom 0.1.16", "k256", "lazy_static", "multihash", @@ -2670,7 +2670,7 @@ dependencies = [ "helium-proto", "hex", "hex-literal", - "itertools 0.10.5", + "itertools", "jsonrpc_client", "lazy_static", "mpl-bubblegum", @@ -2705,13 +2705,15 @@ dependencies = [ [[package]] name = "helium-proto" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=master#fdb83a38fbe8aead4ff6cb39d1e996f0ad0646b7" +source = "git+https://github.com/helium/proto?branch=master#197ff9c6cde7dc0d8334d6b4e27c58779e6a7ce0" dependencies = [ "bytes", "prost", "prost-build", "serde", "serde_json", + "strum", + "strum_macros", "tonic", "tonic-build", ] @@ -3058,15 +3060,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -4030,8 +4023,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck 0.5.0", - "itertools 0.12.1", + "heck 0.4.1", + "itertools", "log", "multimap", "once_cell", @@ -4051,7 +4044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools", "proc-macro2", "quote", "syn 2.0.58", @@ -5317,7 +5310,7 @@ dependencies = [ "console_log", "curve25519-dalek", "getrandom 0.2.15", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "libc", @@ -5357,7 +5350,7 @@ dependencies = [ "bincode", "eager", "enum-iterator", - "itertools 0.10.5", + "itertools", "libc", "log", "num-derive 0.4.2", @@ -5409,7 +5402,7 @@ dependencies = [ "async-mutex", "async-trait", "futures", - "itertools 0.10.5", + "itertools", "lazy_static", "log", "quinn", @@ -5538,7 +5531,7 @@ dependencies = [ "ed25519-dalek-bip32", "generic-array", "hmac 0.12.1", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "libsecp256k1", @@ -5603,7 +5596,7 @@ dependencies = [ "futures-util", "histogram", "indexmap 2.2.6", - "itertools 0.10.5", + "itertools", "libc", "log", "nix", @@ -5754,7 +5747,7 @@ dependencies = [ "byteorder", "curve25519-dalek", "getrandom 0.1.16", - "itertools 0.10.5", + "itertools", "lazy_static", "merlin", "num-derive 0.4.2", @@ -6251,6 +6244,28 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.58", +] + [[package]] name = "subtle" version = "2.4.1" diff --git a/helium-lib/src/client.rs b/helium-lib/src/client.rs index 7d99ce50..9b9950e7 100644 --- a/helium-lib/src/client.rs +++ b/helium-lib/src/client.rs @@ -681,6 +681,7 @@ pub mod config { DeviceType::Cbrs => MobileDeviceType::Cbrs, DeviceType::WifiIndoor => MobileDeviceType::WifiIndoor, DeviceType::WifiOutdoor => MobileDeviceType::WifiOutdoor, + DeviceType::WifiDataOnly => MobileDeviceType::WifiDataOnly, }; Ok((