diff options
Diffstat (limited to 'jsonrpc')
| -rw-r--r-- | jsonrpc/README.md | 4 | ||||
| -rw-r--r-- | jsonrpc/examples/client.rs | 2 | ||||
| -rw-r--r-- | jsonrpc/examples/server.rs | 2 | ||||
| -rw-r--r-- | jsonrpc/src/client.rs | 6 | ||||
| -rw-r--r-- | jsonrpc/src/lib.rs | 4 | ||||
| -rw-r--r-- | jsonrpc/src/server.rs | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/jsonrpc/README.md b/jsonrpc/README.md index 929d645..f7ee641 100644 --- a/jsonrpc/README.md +++ b/jsonrpc/README.md @@ -30,7 +30,7 @@ let ex = Arc::new(smol::Executor::new()); // Creates a new server let listener = TcpListener::bind("127.0.0.1:60000").await.unwrap(); let config = ServerConfig::default(); -let server = Server::new(listener.into(), config, ex.clone()); +let server = Server::new(listener, config, ex.clone()); // Register the HelloWorld service register_service!(HelloWorld, say_hello); @@ -45,7 +45,7 @@ ex.run(server.start()); // Creates a new client let conn = TcpStream::connect("127.0.0.1:60000").await.unwrap(); let config = ClientConfig::default(); -let client = Client::new(conn.into(), config); +let client = Client::new(conn, config); let result: String = client.call("HelloWorld.say_hello", "world".to_string()).await.unwrap(); diff --git a/jsonrpc/examples/client.rs b/jsonrpc/examples/client.rs index 8f46a8e..b28760d 100644 --- a/jsonrpc/examples/client.rs +++ b/jsonrpc/examples/client.rs @@ -17,7 +17,7 @@ fn main() { smol::future::block_on(async { let conn = TcpStream::connect("127.0.0.1:60000").await.unwrap(); let config = ClientConfig::default(); - let client = Client::new(conn.into(), config); + let client = Client::new(conn, config); let params = Req { x: 10, y: 7 }; let result: u32 = client.call("Calc.add", params).await.unwrap(); diff --git a/jsonrpc/examples/server.rs b/jsonrpc/examples/server.rs index 4109e0d..b09232f 100644 --- a/jsonrpc/examples/server.rs +++ b/jsonrpc/examples/server.rs @@ -46,7 +46,7 @@ fn main() { // Creates a new server let listener = TcpListener::bind("127.0.0.1:60000").await.unwrap(); let config = ServerConfig::default(); - let server = Server::new(listener.into(), config, ex); + let server = Server::new(listener, config, ex); // Register the Calc service register_service!(Calc, ping, add, sub, version); diff --git a/jsonrpc/src/client.rs b/jsonrpc/src/client.rs index 0061002..69c2e6d 100644 --- a/jsonrpc/src/client.rs +++ b/jsonrpc/src/client.rs @@ -2,7 +2,7 @@ use log::debug; use serde::{de::DeserializeOwned, Serialize}; use karyons_core::util::random_32; -use karyons_net::Conn; +use karyons_net::ToConn; use crate::{ codec::{Codec, CodecConfig}, @@ -23,12 +23,12 @@ pub struct Client { impl Client { /// Creates a new RPC client by passing a Tcp, Unix, or Tls connection. - pub fn new(conn: Conn, config: ClientConfig) -> Self { + pub fn new<C: ToConn>(conn: C, config: ClientConfig) -> Self { let codec_config = CodecConfig { max_allowed_buffer_size: 0, ..Default::default() }; - let codec = Codec::new(conn, codec_config); + let codec = Codec::new(conn.to_conn(), codec_config); Self { codec, config } } diff --git a/jsonrpc/src/lib.rs b/jsonrpc/src/lib.rs index 65fb38f..da9047d 100644 --- a/jsonrpc/src/lib.rs +++ b/jsonrpc/src/lib.rs @@ -27,7 +27,7 @@ //! // Creates a new server //! let listener = TcpListener::bind("127.0.0.1:60000").await.unwrap(); //! let config = ServerConfig::default(); -//! let server = Server::new(listener.into(), config, ex.clone()); +//! let server = Server::new(listener, config, ex.clone()); //! //! // Register the HelloWorld service //! register_service!(HelloWorld, say_hello); @@ -43,7 +43,7 @@ //! // Creates a new client //! let conn = TcpStream::connect("127.0.0.1:60000").await.unwrap(); //! let config = ClientConfig::default(); -//! let client = Client::new(conn.into(), config); +//! let client = Client::new(conn, config); //! //! let result: String = client.call("HelloWorld.say_hello", "world".to_string()).await.unwrap(); //! }; diff --git a/jsonrpc/src/server.rs b/jsonrpc/src/server.rs index 44de336..4f1bada 100644 --- a/jsonrpc/src/server.rs +++ b/jsonrpc/src/server.rs @@ -8,7 +8,7 @@ use karyons_core::{ Executor, }; -use karyons_net::{Conn, Listener}; +use karyons_net::{Conn, Listener, ToListener}; use crate::{ codec::{Codec, CodecConfig}, @@ -33,9 +33,9 @@ pub struct Server<'a> { impl<'a> Server<'a> { /// Creates a new RPC server by passing a listener. It supports Tcp, Unix, and Tls. - pub fn new(listener: Listener, config: ServerConfig, ex: Executor<'a>) -> Arc<Self> { + pub fn new<T: ToListener>(listener: T, config: ServerConfig, ex: Executor<'a>) -> Arc<Self> { Arc::new(Self { - listener, + listener: listener.to_listener(), services: RwLock::new(HashMap::new()), task_group: TaskGroup::new(ex), config, |