Work in progress

miaokong0724 · Apr 11, 2022 · a12931b · a12931b
1 parent aa10213
commit a12931b
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 73 deletions.
diff --git a/lib/src/client/builder.rs b/lib/src/client/builder.rs
@@ -4,7 +4,7 @@
 
 use std::path::PathBuf;
 
-use crate::client::{config::*, *};
+use crate::client::{client::Client, config::*};
 use crate::core::config::Config;
 
 /// The `ClientBuilder` is a builder for producing a [`Client`]. It is an alternative to constructing

diff --git a/lib/src/client/config.rs b/lib/src/client/config.rs
@@ -310,7 +310,7 @@ impl ClientConfig {
         let mut pki_dir = std::env::current_dir().unwrap();
         pki_dir.push(Self::PKI_DIR);
 
-        let decoding_options = opcua_types::DecodingOptions::default();
+        let decoding_options = crate::types::DecodingOptions::default();
 
         ClientConfig {
             application_name: application_name.into(),

diff --git a/lib/src/client/session/session.rs b/lib/src/client/session/session.rs
diff --git a/lib/src/client/session/session_state.rs b/lib/src/client/session/session_state.rs
@@ -22,6 +22,7 @@ use crate::types::{status_code::StatusCode, *};
 use crate::client::{
     callbacks::{OnConnectionStatusChange, OnSessionClosed},
     message_queue::MessageQueue,
+    process_unexpected_response,
 };
 
 #[derive(Copy, Clone, PartialEq, Debug)]
@@ -479,7 +480,7 @@ impl SessionState {
             }
             Ok(())
         } else {
-            Err(crate::process_unexpected_response(response))
+            Err(process_unexpected_response(response))
         }
     }
 

diff --git a/lib/src/crypto/security_policy.rs b/lib/src/crypto/security_policy.rs
@@ -93,7 +93,7 @@ mod aes_256_sha_256_rsa_pss {
 ///   AsymmetricKeyLength - 2048-4096 bits
 ///   SecureChannelNonceLength - 32 bytes
 mod basic_256_sha_256 {
-    use crate::crypto::*;
+    use crate::crypto::algorithms::*;
 
     pub const SECURITY_POLICY: &str = "Basic256Sha256";
     pub const SECURITY_POLICY_URI: &str =
@@ -120,7 +120,7 @@ mod basic_256_sha_256 {
 ///   AsymmetricKeyLength - 1024-2048 bits
 ///   SecureChannelNonceLength - 16 bytes
 mod basic_128_rsa_15 {
-    use crate::crypto::*;
+    use crate::crypto::algorithms::*;
 
     pub const SECURITY_POLICY: &str = "Basic128Rsa15";
     pub const SECURITY_POLICY_URI: &str =
@@ -147,7 +147,7 @@ mod basic_128_rsa_15 {
 ///   AsymmetricKeyLength - 1024-2048 bits
 ///   SecureChannelNonceLength - 32 bytes
 mod basic_256 {
-    use crate::crypto::*;
+    use crate::crypto::algorithms::*;
 
     pub const SECURITY_POLICY: &str = "Basic256";
     pub const SECURITY_POLICY_URI: &str = "http://opcfoundation.org/UA/SecurityPolicy#Basic256";

diff --git a/lib/src/server/address_space/mod.rs b/lib/src/server/address_space/mod.rs
@@ -383,7 +383,7 @@ macro_rules! node_base_impl {
     ( $node_struct:ident ) => {
         use crate::{
             server::address_space::node::NodeType,
-            types::{service_types, status_code::StatusCode, *},
+            types::{status_code::StatusCode, *},
         };
 
         impl Into<NodeType> for $node_struct {

diff --git a/lib/src/server/comms/tcp_transport.rs b/lib/src/server/comms/tcp_transport.rs
@@ -36,7 +36,6 @@ use crate::core::{
         message_writer::MessageWriter,
         secure_channel::SecureChannel,
         tcp_codec::{self, TcpCodec},
-        tcp_types::*,
     },
     prelude::*,
     RUNTIME,

diff --git a/lib/src/server/services/attribute.rs b/lib/src/server/services/attribute.rs
@@ -14,7 +14,7 @@ use crate::{
 
 use super::super::{
     address_space::{
-        node::{HasNodeId, NodeType},
+        node::{HasNodeId, NodeBase, NodeType},
         variable::Variable,
         AddressSpace, UserAccessLevel,
     },