Extract blockchain from ethcore (#10114)
* Split blockchain & db from ethcore. * Clean up blockchain deps. * Missing docs. * Fix blockchain tests. * Make other crates compile. * Remove some re-exports. * Remove types re-export from ethcore. * Remove EVM dependency from transaction. * Merge ethcore-transaction with common-types. * Clean-up ethcore deps a bit. * remove ethcore from cargo.toml * Update ethcore/blockchain/src/lib.rs Co-Authored-By: tomusdrw <tomusdrw@users.noreply.github.com> * Address review comments. * Update DB comment. * Add tracking issue to the TODO and fix typo. * Common naming for common types. * Update ethcore/db/src/keys.rs Co-Authored-By: tomusdrw <tomusdrw@users.noreply.github.com> * Update ethcore/blockchain/src/generator.rs Co-Authored-By: tomusdrw <tomusdrw@users.noreply.github.com> * Try to fix beta tests.
This commit is contained in:
committed by
Afri Schoedon
parent
3090324366
commit
3650f2d51c
@@ -29,10 +29,12 @@ use memorydb::MemoryDB;
|
||||
use parking_lot::RwLock;
|
||||
use rlp::{Rlp, RlpStream};
|
||||
use rustc_hex::{FromHex, ToHex};
|
||||
use types::BlockNumber;
|
||||
use types::encoded;
|
||||
use types::header::Header;
|
||||
use vm::{EnvInfo, CallType, ActionValue, ActionParams, ParamsType};
|
||||
|
||||
use builtin::Builtin;
|
||||
use encoded;
|
||||
use engines::{
|
||||
EthEngine, NullEngine, InstantSeal, InstantSealParams, BasicAuthority,
|
||||
AuthorityRound, DEFAULT_BLOCKHASH_CONTRACT
|
||||
@@ -40,7 +42,6 @@ use engines::{
|
||||
use error::Error;
|
||||
use executive::Executive;
|
||||
use factory::Factories;
|
||||
use header::{BlockNumber, Header};
|
||||
use machine::EthereumMachine;
|
||||
use pod_state::PodState;
|
||||
use spec::Genesis;
|
||||
@@ -840,7 +841,7 @@ impl Spec {
|
||||
/// initialize genesis epoch data, using in-memory database for
|
||||
/// constructor.
|
||||
pub fn genesis_epoch_data(&self) -> Result<Vec<u8>, String> {
|
||||
use transaction::{Action, Transaction};
|
||||
use types::transaction::{Action, Transaction};
|
||||
use journaldb;
|
||||
use kvdb_memorydb;
|
||||
|
||||
@@ -989,8 +990,9 @@ mod tests {
|
||||
use super::*;
|
||||
use state::State;
|
||||
use test_helpers::get_temp_state_db;
|
||||
use views::BlockView;
|
||||
use tempdir::TempDir;
|
||||
use types::view;
|
||||
use types::views::BlockView;
|
||||
|
||||
// https://github.com/paritytech/parity-ethereum/issues/1840
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user