Skip to content

Migrate gateway client to v2 #1024

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate gateway client to v2 #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 3 deletions mobile_config/src/client/gateway_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ pub trait GatewayInfoResolver: Clone + Send + Sync + 'static {
async fn stream_gateways_info(
&mut self,
device_types: &[DeviceType],
min_updated_at: u64,
) -> Result<GatewayInfoStream, ClientError>;
}

Expand All @@ -74,7 +75,7 @@ impl GatewayInfoResolver for GatewayClient {
};
request.signature = self.signing_key.sign(&request.encode_to_vec())?;
tracing::debug!(pubkey = address.to_string(), "fetching gateway info");
let response = match call_with_retry!(self.client.clone().info(request.clone())) {
let response = match call_with_retry!(self.client.clone().info_v2(request.clone())) {
Ok(info_res) => {
let response = info_res.into_inner();
response.verify(&self.config_pubkey)?;
Expand All @@ -99,17 +100,19 @@ impl GatewayInfoResolver for GatewayClient {
async fn stream_gateways_info(
&mut self,
device_types: &[DeviceType],
min_updated_at: u64,
) -> Result<gateway_info::GatewayInfoStream, ClientError> {
let mut req = mobile_config::GatewayInfoStreamReqV1 {
let mut req = mobile_config::GatewayInfoStreamReqV2 {
batch_size: self.batch_size,
device_types: device_types.iter().map(|v| DeviceType::into(*v)).collect(),
signer: self.signing_key.public_key().into(),
signature: vec![],
min_updated_at,
};
req.signature = self.signing_key.sign(&req.encode_to_vec())?;
tracing::debug!("fetching gateway info stream");
let pubkey = Arc::new(self.config_pubkey.clone());
let res_stream = call_with_retry!(self.client.info_stream(req.clone()))?
let res_stream = call_with_retry!(self.client.info_stream_v2(req.clone()))?
.into_inner()
.filter_map(|res| async move { res.ok() })
.map(move |res| (res, pubkey.clone()))
Expand Down
1 change: 1 addition & 0 deletions mobile_verifier/tests/integrations/speedtests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ impl GatewayInfoResolver for MockGatewayInfoResolver {
async fn stream_gateways_info(
&mut self,
_device_types: &[MobileDeviceType],
_min_updated_at: u64,
) -> Result<GatewayInfoStream, ClientError> {
todo!()
}
Expand Down