Implement JSON RPC net_getPort

CodeChain-io · Aug 4, 2018 · 480994f · 480994f
1 parent 564c651
commit 480994f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/codechain/main.rs b/codechain/main.rs
@@ -273,6 +273,10 @@ impl NetworkControl for DummyNetworkService {
     fn is_connected(&self, _addr: &SocketAddr) -> Result<bool, NetworkControlError> {
         Err(NetworkControlError::Disabled)
     }
+
+    fn get_port(&self) -> Result<u16, NetworkControlError> {
+        Err(NetworkControlError::Disabled)
+    }
 }
 
 fn run_node(matches: ArgMatches) -> Result<(), String> {

diff --git a/network/src/control.rs b/network/src/control.rs
@@ -25,6 +25,7 @@ pub trait Control: Send + Sync {
     fn connect(&self, addr: SocketAddr) -> Result<(), Error>;
     fn disconnect(&self, addr: SocketAddr) -> Result<(), Error>;
     fn is_connected(&self, addr: &SocketAddr) -> Result<bool, Error>;
+    fn get_port(&self) -> Result<u16, Error>;
 }
 
 #[derive(Clone, Debug)]

diff --git a/network/src/service.rs b/network/src/service.rs
@@ -35,6 +35,7 @@ pub struct Service {
     timer: IoService<timer::Message>,
     client: Arc<Client>,
     routing_table: Arc<RoutingTable>,
+    socket_address: SocketAddr,
 }
 
 impl Service {
@@ -68,6 +69,7 @@ impl Service {
             timer,
             client,
             routing_table,
+            socket_address: address,
         }))
     }
 
@@ -126,6 +128,10 @@ impl Control for Service {
     fn is_connected(&self, addr: &SocketAddr) -> Result<bool, ControlError> {
         Ok(self.routing_table.is_connected(addr))
     }
+
+    fn get_port(&self) -> Result<u16, ControlError> {
+        Ok(self.socket_address.port())
+    }
 }
 
 #[derive(Debug)]

diff --git a/rpc/src/v1/impls/net.rs b/rpc/src/v1/impls/net.rs
@@ -54,4 +54,8 @@ impl Net for NetClient {
     fn is_connected(&self, address: ::std::net::IpAddr, port: u16) -> Result<bool> {
         Ok(self.network_control.is_connected(&SocketAddr::new(address, port)).map_err(errors::network_control)?)
     }
+
+    fn get_port(&self) -> Result<u16> {
+        Ok(self.network_control.get_port().map_err(errors::network_control)?)
+    }
 }
diff --git a/rpc/src/v1/traits/net.rs b/rpc/src/v1/traits/net.rs
@@ -30,5 +30,8 @@ build_rpc_trait! {
 
         # [rpc(name = "net_isConnected")]
         fn is_connected(&self, ::std::net::IpAddr, u16) -> Result<bool>;
+
+        # [rpc(name = "net_getPort")]
+        fn get_port(&self) -> Result<u16>;
     }
 }