From 5f59273499a91d465cfcf8ca58487ddba9ab69d0 Mon Sep 17 00:00:00 2001 From: gskapka Date: Wed, 1 May 2024 10:22:19 +0100 Subject: [PATCH 1/3] fix(sentinel-strongbox): <- update imports to `NetworkId` in that --- Cargo.lock | 1 + v3_bridges/sentinel-strongbox/Cargo.toml | 1 + .../sentinel-strongbox/src/android/handlers/check_init.rs | 3 ++- .../src/android/handlers/get_cancellable_user_ops.rs | 3 +-- .../sentinel-strongbox/src/android/handlers/get_core_state.rs | 3 ++- .../src/android/handlers/get_latest_block_infos.rs | 2 +- .../sentinel-strongbox/src/android/handlers/get_status.rs | 3 ++- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 410613627..08ae2a2db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4390,6 +4390,7 @@ dependencies = [ "jni", "log", "metadata", + "network_ids", "sentinel-lib", "serde", "serde_json", diff --git a/v3_bridges/sentinel-strongbox/Cargo.toml b/v3_bridges/sentinel-strongbox/Cargo.toml index 7500184c3..abcda6e24 100644 --- a/v3_bridges/sentinel-strongbox/Cargo.toml +++ b/v3_bridges/sentinel-strongbox/Cargo.toml @@ -30,5 +30,6 @@ common = { workspace = true } common_eth = { workspace = true } common_sentinel = { workspace = true } common_metadata = { workspace = true } +common_network_ids = { workspace = true } common_debug_signers = { workspace = true } common_file_logger = { workspace = true, optional = true } diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/check_init.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/check_init.rs index 872b38ad3..d643ee949 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/check_init.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/check_init.rs @@ -1,6 +1,7 @@ use common_eth::{Chain, ChainDbUtils}; use common_metadata::MetadataChainId; -use common_sentinel::{NetworkId, SentinelError, WebSocketMessagesEncodable, WebSocketMessagesError}; +use common_sentinel::{SentinelError, WebSocketMessagesEncodable, WebSocketMessagesError}; +use common_network_ids::NetworkId; use serde_json::json; use crate::android::State; diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/get_cancellable_user_ops.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/get_cancellable_user_ops.rs index 0c511431d..a32ab6874 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/get_cancellable_user_ops.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/get_cancellable_user_ops.rs @@ -4,12 +4,11 @@ use common_sentinel::{ CancellableUserOps, LatestBlockInfo, LatestBlockInfos, - NetworkId, - NetworkIdError, SentinelDbUtils, SentinelError, WebSocketMessagesEncodable, }; +use common_network_ids::{NetworkId, NetworkIdError}; use serde_json::json; use crate::android::State; diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/get_core_state.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/get_core_state.rs index 0f5570915..f8f2099fc 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/get_core_state.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/get_core_state.rs @@ -1,4 +1,5 @@ -use common_sentinel::{CoreState, NetworkId, SentinelError, WebSocketMessagesEncodable}; +use common_sentinel::{CoreState, SentinelError, WebSocketMessagesEncodable}; +use common_network_ids::NetworkId; use serde_json::json; use crate::android::State; diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/get_latest_block_infos.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/get_latest_block_infos.rs index 662e9115a..9553e9546 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/get_latest_block_infos.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/get_latest_block_infos.rs @@ -3,11 +3,11 @@ use common_metadata::MetadataChainId; use common_sentinel::{ LatestBlockInfo, LatestBlockInfos, - NetworkId, SentinelError, WebSocketMessagesEncodable, WebSocketMessagesError, }; +use common_network_ids::NetworkId; use serde_json::json; use crate::android::State; diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/get_status.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/get_status.rs index e0df947c3..e14d2a713 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/get_status.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/get_status.rs @@ -1,6 +1,7 @@ use common_eth::{Chain, ChainDbUtils}; use common_metadata::MetadataChainId; -use common_sentinel::{NetworkId, NetworkIdError, SentinelError, SentinelStatus, WebSocketMessagesEncodable}; +use common_sentinel::{SentinelError, SentinelStatus, WebSocketMessagesEncodable}; +use common_network_ids::{NetworkId, NetworkIdError}; use serde_json::json; use crate::android::State; From f0d68983ba09972b5ba1c5c746bd04b4784b331f Mon Sep 17 00:00:00 2001 From: gskapka Date: Wed, 1 May 2024 10:30:56 +0100 Subject: [PATCH 2/3] chore(linting): <- apply that --- .../sentinel-strongbox/src/android/handlers/check_init.rs | 2 +- .../src/android/handlers/get_cancellable_user_ops.rs | 2 +- .../sentinel-strongbox/src/android/handlers/get_core_state.rs | 2 +- .../src/android/handlers/get_latest_block_infos.rs | 2 +- .../sentinel-strongbox/src/android/handlers/get_status.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/check_init.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/check_init.rs index d643ee949..43628d99f 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/check_init.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/check_init.rs @@ -1,7 +1,7 @@ use common_eth::{Chain, ChainDbUtils}; use common_metadata::MetadataChainId; -use common_sentinel::{SentinelError, WebSocketMessagesEncodable, WebSocketMessagesError}; use common_network_ids::NetworkId; +use common_sentinel::{SentinelError, WebSocketMessagesEncodable, WebSocketMessagesError}; use serde_json::json; use crate::android::State; diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/get_cancellable_user_ops.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/get_cancellable_user_ops.rs index a32ab6874..1067ca1c6 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/get_cancellable_user_ops.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/get_cancellable_user_ops.rs @@ -1,5 +1,6 @@ use common_eth::{Chain, ChainDbUtils, ChainError}; use common_metadata::MetadataChainId; +use common_network_ids::{NetworkId, NetworkIdError}; use common_sentinel::{ CancellableUserOps, LatestBlockInfo, @@ -8,7 +9,6 @@ use common_sentinel::{ SentinelError, WebSocketMessagesEncodable, }; -use common_network_ids::{NetworkId, NetworkIdError}; use serde_json::json; use crate::android::State; diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/get_core_state.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/get_core_state.rs index f8f2099fc..3288440d0 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/get_core_state.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/get_core_state.rs @@ -1,5 +1,5 @@ -use common_sentinel::{CoreState, SentinelError, WebSocketMessagesEncodable}; use common_network_ids::NetworkId; +use common_sentinel::{CoreState, SentinelError, WebSocketMessagesEncodable}; use serde_json::json; use crate::android::State; diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/get_latest_block_infos.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/get_latest_block_infos.rs index 9553e9546..1eb67985b 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/get_latest_block_infos.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/get_latest_block_infos.rs @@ -1,5 +1,6 @@ use common_eth::{Chain, ChainDbUtils}; use common_metadata::MetadataChainId; +use common_network_ids::NetworkId; use common_sentinel::{ LatestBlockInfo, LatestBlockInfos, @@ -7,7 +8,6 @@ use common_sentinel::{ WebSocketMessagesEncodable, WebSocketMessagesError, }; -use common_network_ids::NetworkId; use serde_json::json; use crate::android::State; diff --git a/v3_bridges/sentinel-strongbox/src/android/handlers/get_status.rs b/v3_bridges/sentinel-strongbox/src/android/handlers/get_status.rs index e14d2a713..3667edd3a 100644 --- a/v3_bridges/sentinel-strongbox/src/android/handlers/get_status.rs +++ b/v3_bridges/sentinel-strongbox/src/android/handlers/get_status.rs @@ -1,7 +1,7 @@ use common_eth::{Chain, ChainDbUtils}; use common_metadata::MetadataChainId; -use common_sentinel::{SentinelError, SentinelStatus, WebSocketMessagesEncodable}; use common_network_ids::{NetworkId, NetworkIdError}; +use common_sentinel::{SentinelError, SentinelStatus, WebSocketMessagesEncodable}; use serde_json::json; use crate::android::State; From 24a30be9f8f0139bb4c630964552e76d4cb6e4f5 Mon Sep 17 00:00:00 2001 From: gskapka Date: Wed, 1 May 2024 10:25:27 +0100 Subject: [PATCH 3/3] chore(sentinel-stronbox): <- bump patch fix version number in that --- Cargo.lock | 2 +- v3_bridges/sentinel-strongbox/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08ae2a2db..1d7cb355e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4375,7 +4375,7 @@ dependencies = [ [[package]] name = "sentinel-strongbox" -version = "0.1.0" +version = "0.1.1" dependencies = [ "android_logger", "common", diff --git a/v3_bridges/sentinel-strongbox/Cargo.toml b/v3_bridges/sentinel-strongbox/Cargo.toml index abcda6e24..0a5041095 100644 --- a/v3_bridges/sentinel-strongbox/Cargo.toml +++ b/v3_bridges/sentinel-strongbox/Cargo.toml @@ -1,6 +1,6 @@ [package] edition = "2021" -version = "0.1.0" +version = "0.1.1" name = "sentinel-strongbox" authors = [ "Greg Kapka " ] description = "The android/strongbox library for a pTokens EVM sentinel"