Fix typo and refactoring reviewed function

Author: kakao-jun-e

codechain/main.rs

@@ -144,12 +144,15 @@ pub fn client_start(cfg: &config::Config, spec: &Spec, miner: Arc<Miner>) -> Res
 
 pub fn stratum_start(cfg: &StratumConfig, miner: Arc<Miner>, client: Arc<Client>) -> Result<(), String> {
     info!("STRATUM Listening on {}", cfg.port);
-    match Stratum::register(cfg, miner, client) {
+    match Stratum::start(cfg, miner.clone(), client) {
         // FIXME: Add specified condition like AddrInUse
         Err(StratumError::Service(_)) =>
             Err(format!("STRATUM address {} is already in use, make sure that another instance of a CodeChain node is not running or change the address using the --stratum-port option.", cfg.port)),
         Err(e) => Err(format!("STRATUM start error: {:?}", e)),
-        Ok(_) => Ok(())
+        Ok(stratum) => {
+            miner.add_work_listener(Box::new(stratum));
+            Ok(())
+        }
     }
 }
 

core/src/miner/stratum.rs

@@ -19,8 +19,7 @@
 use std::net::{AddrParseError, SocketAddr};
 use std::sync::Arc;
 
-use cstratum::PushWorkHandler;
-use cstratum::{Error as StratumServiceError, JobDispatcher, Stratum as StratumService};
+use cstratum::{Error as StratumServiceError, JobDispatcher, PushWorkHandler, Stratum as StratumService};
 use primitives::{Bytes, H256, U256};
 
 use super::super::client::Client;
@@ -38,16 +37,6 @@ pub struct Config {
     pub secret: Option<H256>,
 }
 
-impl Default for Config {
-    fn default() -> Self {
-        Config {
-            listen_addr: "0.0.0.0:0".parse().unwrap(),
-            port: 3333,
-            secret: None,
-        }
-    }
-}
-
 /// Job dispatcher for stratum service
 pub struct StratumJobDispatcher {
     client: Arc<Client>,
@@ -60,21 +49,6 @@ impl JobDispatcher for StratumJobDispatcher {
         self.job()
     }
 
-    fn job(&self) -> Option<String> {
-        if !self.miner.can_produce_work_package() {
-            cwarn!(STRATUM, "Cannot give work package - engine seals internally.");
-            return None
-        }
-
-        if self.miner.author().is_zero() {
-            cwarn!(STRATUM, "Cannot give work package - no author is configured. Use --author to configure!");
-            return None
-        }
-
-        // TODO: should provide initial values for mining
-        None
-    }
-
     fn submit(&self, payload: (H256, Vec<Bytes>)) -> Result<(), StratumServiceError> {
         let (pow_hash, seal) = payload;
 
@@ -163,11 +137,4 @@ impl Stratum {
             service: stratum_svc,
         })
     }
-
-    /// Start STRATUM job dispatcher and register it in the miner
-    pub fn register(cfg: &Config, miner: Arc<Miner>, client: Arc<Client>) -> Result<(), Error> {
-        let stratum = Stratum::start(cfg, miner.clone(), client.clone())?;
-        miner.add_work_listener(Box::new(stratum) as Box<NotifyWork>);
-        Ok(())
-    }
 }

stratum/src/lib.rs

@@ -428,7 +428,7 @@ mod tests {
     fn can_authorize() {
         let addr = SocketAddr::from_str("127.0.0.1:19970").unwrap();
         let stratum =
-            Stratum::start(&addr, Arc::new(DummyManager::build().of_initial(r#"["dummy autorize payload"]"#)), None)
+            Stratum::start(&addr, Arc::new(DummyManager::build().of_initial(r#"["dummy authorize payload"]"#)), None)
                 .expect("There should be no error starting stratum");
 
         let request = r#"{"jsonrpc": "2.0", "method": "mining.authorize", "params": ["miner1", ""], "id": 1}"#;
@@ -442,7 +442,7 @@ mod tests {
     fn can_push_work() {
         let addr = SocketAddr::from_str("127.0.0.1:19995").unwrap();
         let stratum =
-            Stratum::start(&addr, Arc::new(DummyManager::build().of_initial(r#"["dummy autorize payload"]"#)), None)
+            Stratum::start(&addr, Arc::new(DummyManager::build().of_initial(r#"["dummy authorize payload"]"#)), None)
                 .expect("There should be no error starting stratum");
 
         let mut auth_request = r#"{"jsonrpc": "2.0", "method": "mining.authorize", "params": ["miner1", ""], "id": 1}"#.as_bytes()
@@ -491,7 +491,7 @@ mod tests {
     fn can_respond_to_submition() {
         let addr = SocketAddr::from_str("127.0.0.1:19990").unwrap();
         let _stratum =
-            Stratum::start(&addr, Arc::new(DummyManager::build().of_initial(r#"["dummy autorize payload"]"#)), None)
+            Stratum::start(&addr, Arc::new(DummyManager::build().of_initial(r#"["dummy authorize payload"]"#)), None)
                 .expect("There should be no error starting stratum");
 
         let mut auth_request = r#"{"jsonrpc": "2.0", "method": "mining.authorize", "params": ["miner1", ""], "id": 1}"#.as_bytes()