Remove stratum

Author: Seulgi Kim

Cargo.lock

@@ -31,7 +31,6 @@ codechain-sync = { path = "sync" }
 codechain-timer = { path = "util/timer" }
 codechain-types = { path = "types" }
 codechain-vm = { path = "vm" }
-codechain-stratum = { path = "stratum" }
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 fdlimit = "0.1"
 finally-block = "0.1"

Cargo.toml

@@ -17,7 +17,6 @@ codechain-network = { path = "../network" }
 codechain-state = { path = "../state" }
 codechain-timer = { path = "../util/timer" }
 codechain-types = { path = "../types" }
-codechain-stratum = { path = "../stratum" }
 codechain-vm = { path = "../vm" }
 crossbeam-channel = "0.3"
 hyper = { git = "https://github.com/paritytech/hyper", default-features = false }

core/Cargo.toml

@@ -544,18 +544,6 @@ impl EngineClient for Client {
         }
     }
 
-    /// Submit a seal for a block in the mining queue.
-    fn submit_seal(&self, block_hash: BlockHash, seal: Vec<Bytes>) {
-        if self.importer.miner.submit_seal(self, block_hash, seal).is_err() {
-            cwarn!(CLIENT, "Wrong internal seal submission!")
-        }
-    }
-
-    /// Convert PoW difficulty to target.
-    fn score_to_target(&self, score: &U256) -> U256 {
-        self.engine.score_to_target(score)
-    }
-
     /// Update the best block as the given block hash.
     ///
     /// Used in Tendermint, when going to the commit step.

core/src/client/client.rs

@@ -100,12 +100,6 @@ pub trait EngineClient: Sync + Send + BlockChainTrait + ImportBlock {
     /// Make a new block and seal it.
     fn update_sealing(&self, parent_block: BlockId, allow_empty_block: bool);
 
-    /// Submit a seal for a block in the mining queue.
-    fn submit_seal(&self, block_hash: BlockHash, seal: Vec<Bytes>);
-
-    /// Convert PoW difficulty to target.
-    fn score_to_target(&self, score: &U256) -> U256;
-
     /// Update the best block as the given block hash
     ///
     /// Used in Tendermint, when going to the commit step.

core/src/client/mod.rs

@@ -623,16 +623,6 @@ impl super::EngineClient for TestBlockChainClient {
         self.miner.update_sealing(self, parent_block, allow_empty_block)
     }
 
-    fn submit_seal(&self, block_hash: BlockHash, seal: Vec<Bytes>) {
-        if self.miner.submit_seal(self, block_hash, seal).is_err() {
-            cwarn!(CLIENT, "Wrong internal seal submission!")
-        }
-    }
-
-    fn score_to_target(&self, _score: &U256) -> U256 {
-        U256::zero()
-    }
-
     fn update_best_as_committed(&self, _block_hash: BlockHash) {}
 
     fn get_kvdb(&self) -> Arc<dyn KeyValueDB> {

core/src/client/test_client.rs

@@ -186,9 +186,7 @@ mod tests {
         let b = OpenBlock::try_new(engine, db, &genesis_header, Default::default(), vec![]).unwrap();
         let term_common_params = CommonParams::default_for_test();
         let b = b.close_and_lock(&genesis_header, Some(&term_common_params)).unwrap();
-        if let Some(seal) = engine.generate_seal(Some(b.block()), &genesis_header).seal_fields() {
-            b.seal_block(seal);
-        }
+        assert_eq!(None, engine.generate_seal(Some(b.block()), &genesis_header).seal_fields());
     }
 
     #[test]

core/src/consensus/simple_poa/mod.rs

@@ -127,19 +127,16 @@ const SEAL_FIELDS: usize = 4;
 mod tests {
     use ccrypto::blake256;
     use ckey::Address;
-    use ctypes::{CommonParams, Header};
-    use primitives::Bytes;
+    use ctypes::Header;
 
     use super::super::BitSet;
     use super::message::VoteStep;
     use crate::account_provider::AccountProvider;
-    use crate::block::{ClosedBlock, OpenBlock};
     use crate::client::TestBlockChainClient;
-    use crate::consensus::{CodeChainEngine, EngineError, Seal};
+    use crate::consensus::{EngineError, Seal};
     use crate::error::BlockError;
     use crate::error::Error;
     use crate::scheme::Scheme;
-    use crate::tests::helpers::get_temp_state_db;
 
     use super::*;
 
@@ -155,29 +152,12 @@ mod tests {
         (scheme, tap, test_client)
     }
 
-    fn propose_default(scheme: &Scheme, proposer: Address) -> (ClosedBlock, Vec<Bytes>) {
-        let db = get_temp_state_db();
-        let db = scheme.ensure_genesis_state(db).unwrap();
-        let genesis_header = scheme.genesis_header();
-        let b = OpenBlock::try_new(scheme.engine.as_ref(), db, &genesis_header, proposer, vec![]).unwrap();
-        let seal = scheme.engine.generate_seal(None, &genesis_header).seal_fields().unwrap();
-        let term_common_params = CommonParams::default_for_test();
-        let b = b.close(&genesis_header, Some(&term_common_params)).unwrap();
-        (b, seal)
-    }
-
     fn insert_and_unlock(tap: &Arc<AccountProvider>, acc: &str) -> Address {
         let addr = tap.insert_account(blake256(acc).into(), &acc.into()).unwrap();
         tap.unlock_account_permanently(addr, acc.into()).unwrap();
         addr
     }
 
-    fn insert_and_register(tap: &Arc<AccountProvider>, engine: &dyn CodeChainEngine, acc: &str) -> Address {
-        let addr = insert_and_unlock(tap, acc);
-        engine.set_signer(tap.clone(), addr);
-        addr
-    }
-
     #[test]
     fn has_valid_metadata() {
         use std::time::Duration;
@@ -209,17 +189,6 @@ mod tests {
         }
     }
 
-    #[test]
-    #[ignore] // FIXME
-    fn generate_seal() {
-        let (scheme, tap, _c) = setup();
-
-        let proposer = insert_and_register(&tap, scheme.engine.as_ref(), "1");
-
-        let (b, seal) = propose_default(&scheme, proposer);
-        b.lock().seal_block(seal);
-    }
-
     #[test]
     #[ignore] // FIXME
     fn parent_block_existence_checking() {

core/src/consensus/tendermint/mod.rs

@@ -177,10 +177,6 @@ pub enum Error {
     Engine(EngineError),
     /// Key error.
     Key(KeyError),
-    /// PoW hash is invalid or out of date.
-    PowHashInvalid,
-    /// The value of the nonce or mishash is invalid.
-    PowInvalid,
     Scheme(SchemeError),
     /// Account Provider error.
     AccountProvider(AccountProviderError),
@@ -200,8 +196,6 @@ impl fmt::Display for Error {
             Error::Import(err) => err.fmt(f),
             Error::Engine(err) => err.fmt(f),
             Error::Key(err) => err.fmt(f),
-            Error::PowHashInvalid => f.write_str("Invalid or out of date PoW hash."),
-            Error::PowInvalid => f.write_str("Invalid nonce or mishash"),
             Error::Scheme(err) => err.fmt(f),
             Error::AccountProvider(err) => err.fmt(f),
             Error::Trie(err) => err.fmt(f),

core/src/error.rs

@@ -27,7 +27,6 @@ extern crate codechain_logger as clogger;
 extern crate codechain_merkle as cmerkle;
 extern crate codechain_network as cnetwork;
 extern crate codechain_state as cstate;
-extern crate codechain_stratum as cstratum;
 extern crate codechain_timer as ctimer;
 extern crate codechain_types as ctypes;
 extern crate codechain_vm as cvm;
@@ -71,7 +70,7 @@ pub use crate::client::{
 pub use crate::consensus::{EngineType, TimeGapParams};
 pub use crate::db::{COL_STATE, NUM_COLUMNS};
 pub use crate::error::{BlockImportError, Error, ImportError};
-pub use crate::miner::{MemPoolFees, Miner, MinerOptions, MinerService, Stratum, StratumConfig, StratumError};
+pub use crate::miner::{MemPoolFees, Miner, MinerOptions, MinerService};
 pub use crate::scheme::Scheme;
 pub use crate::service::ClientService;
 pub use crate::transaction::{