Skip to content

Mj/update tonic prost #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
michaeldjeffrey wants to merge 3 commits into from
Closed

Mj/update tonic prost #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bebfa9
Update tonic and prost
michaeldjeffrey Jul 21, 2025
a6378d7
Re-export tonic and prost as top level exports
michaeldjeffrey Jul 21, 2025
6093c58
Only export tonic when services is enabled
michaeldjeffrey Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ path = "src/lib.rs"
members = ["beacon"]

[workspace.dependencies]
# Pin to 0.10 to avoid issues with tls and solana dalek deps
tonic = { version = "0.10" }
bytes = "1"
prost = "0.12"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tonic-build = { version = "0.10" }
prost-build = "0.12"
tonic = { version = "0.13" }
tonic-build = { version = "0.13" }
prost = "0.13"
prost-build = "0.13"

[features]
default= []
Expand Down
4 changes: 2 additions & 2 deletions beacon/src/region.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::{Error, Result};
use helium_proto::{
services::iot_config::GatewayRegionParamsResV1, BlockchainRegionParamV1,
BlockchainRegionParamsV1, DataRate, Message, Region as ProtoRegion, RegionSpreading,
prost::Message, services::iot_config::GatewayRegionParamsResV1, BlockchainRegionParamV1,
BlockchainRegionParamsV1, DataRate, Region as ProtoRegion, RegionSpreading,
};
use rust_decimal::prelude::{Decimal, ToPrimitive};
use serde::{de, Deserialize, Deserializer};
Expand Down
2 changes: 1 addition & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fn main() -> Result<()> {
config!(tonic_build::configure())
.build_server(true)
.build_client(true)
.compile(
.compile_protos(
&MESSAGES
.iter()
.chain(SERVICES)
Expand Down
7 changes: 5 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
include!(concat!(env!("OUT_DIR"), "/helium.rs"));

pub use blockchain_txn::Txn;
pub use prost::{DecodeError, EncodeError, Message};
pub use strum::IntoEnumIterator;

pub use prost;
#[cfg(feature = "services")]
pub use tonic;

#[cfg(feature = "services")]
pub mod services {

use crate::{
BlockchainRegionParamsV1, BlockchainTokenTypeV1, BlockchainTxn, BoostedHexInfoV1, DataRate,
Decimal, EntropyReportV1, GatewayStakingMode, MapperAttach, Region, RoutingAddress,
Expand Down Expand Up @@ -105,7 +109,6 @@ pub mod services {
pub use transaction_client::TransactionClient as Client;
pub use transaction_server::TransactionServer as Server;
}
pub use tonic::transport::*;
}

impl std::str::FromStr for ServiceProvider {
Expand Down