diff --git a/Cargo.lock b/Cargo.lock index 2656f864f..ebfc76fdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1619,7 +1619,7 @@ source = "git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-suppo dependencies = [ "base64 0.21.7", "byteorder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "prost", "rand 0.8.5", "rand_chacha 0.3.0", @@ -1788,7 +1788,7 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -2630,7 +2630,7 @@ dependencies = [ "axum 0.7.4", "bs58 0.4.0", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "http 0.2.11", "notify", "serde", @@ -3212,7 +3212,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "hex-literal", "http 0.2.11", "lazy_static", @@ -3794,7 +3794,7 @@ dependencies = [ "h3o", "helium-anchor-gen", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=master)", + "helium-proto", "hex", "hex-literal", "itertools", @@ -3821,23 +3821,6 @@ dependencies = [ [[package]] name = "helium-proto" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support#bac002ac419dd8f75af81cd30afc67871ac2c93a" -dependencies = [ - "bytes", - "prost", - "prost-build", - "serde", - "serde_json", - "strum", - "strum_macros", - "tonic", - "tonic-build", -] - -[[package]] -name = "helium-proto" -version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=master#c5c67f5631b69ef696961995045c0a41f9a5b936" dependencies = [ "bytes", "prost", @@ -3891,7 +3874,7 @@ dependencies = [ "async-trait", "chrono", "derive_builder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "hextree", "rust_decimal", "rust_decimal_macros", @@ -4307,7 +4290,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "http 0.2.11", "humantime-serde", "metrics", @@ -4377,7 +4360,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -4421,7 +4404,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -4464,7 +4447,7 @@ dependencies = [ "h3o", "helium-crypto", "helium-lib", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "http-serde", "humantime-serde", "iot-config", @@ -5052,7 +5035,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -5094,7 +5077,7 @@ dependencies = [ "futures", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "mobile-config", "prost", "rand 0.8.5", @@ -5130,7 +5113,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -5175,7 +5158,7 @@ dependencies = [ "h3o", "helium-crypto", "helium-lib", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "hex-assignments", "hextree", "http-serde", @@ -5859,7 +5842,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "http 0.2.11", "hyper 0.14.28", "jsonrpsee", @@ -5942,7 +5925,7 @@ dependencies = [ "futures-util", "helium-anchor-gen", "helium-lib", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6083,7 +6066,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" dependencies = [ "bytes", - "heck 0.5.0", + "heck 0.4.0", "itertools", "log", "multimap", @@ -6581,7 +6564,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", + "helium-proto", "humantime-serde", "lazy_static", "metrics", diff --git a/Cargo.toml b/Cargo.toml index acac87a64..fae3f6697 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -132,6 +132,6 @@ sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df65 # Patching for beacon must point directly to the crate, it will not look in the # repo for sibling crates. # -# [patch.'https://github.com/helium/proto'] -# helium-proto = { path = "../../proto" } + [patch.'https://github.com/helium/proto'] + helium-proto = { path = "../../proto" } # beacon = { path = "../../proto" }