Merge pull request #26 from pnetwork-association/fix-strongbox-networ…

…k-id-imports fix(sentinel-strongbox): <- update imports to `NetworkId` in that
pnetwork-association · May 7, 2024 · e6d54b6 · e6d54b6
2 parents a619b09 + 24a30be
commit e6d54b6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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 <gregkapka@gmail.com>" ]
 description = "The android/strongbox library for a pTokens EVM sentinel"
@@ -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
@@ -1,6 +1,7 @@
 use common_eth::{Chain, ChainDbUtils};
 use common_metadata::MetadataChainId;
-use common_sentinel::{NetworkId, 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
@@ -1,11 +1,10 @@
 use common_eth::{Chain, ChainDbUtils, ChainError};
 use common_metadata::MetadataChainId;
+use common_network_ids::{NetworkId, NetworkIdError};
 use common_sentinel::{
     CancellableUserOps,
     LatestBlockInfo,
     LatestBlockInfos,
-    NetworkId,
-    NetworkIdError,
     SentinelDbUtils,
     SentinelError,
     WebSocketMessagesEncodable,

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
@@ -1,4 +1,5 @@
-use common_sentinel::{CoreState, NetworkId, 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
@@ -1,9 +1,9 @@
 use common_eth::{Chain, ChainDbUtils};
 use common_metadata::MetadataChainId;
+use common_network_ids::NetworkId;
 use common_sentinel::{
     LatestBlockInfo,
     LatestBlockInfos,
-    NetworkId,
     SentinelError,
     WebSocketMessagesEncodable,
     WebSocketMessagesError,

diff --git 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_network_ids::{NetworkId, NetworkIdError};
+use common_sentinel::{SentinelError, SentinelStatus, WebSocketMessagesEncodable};
 use serde_json::json;
 
 use crate::android::State;