Merge branch 'develop' into zhangsoledad/ckb2021-develop-confilct-res…

…olved

chain/src/tests/load_input_data_hash_cell.rs

@@ -4,7 +4,6 @@ use crate::tests::util::{
 use ckb_chain_spec::consensus::ConsensusBuilder;
 use ckb_dao_utils::genesis_dao_data;
 use ckb_test_chain_utils::load_input_data_hash_cell;
-use ckb_tx_pool::{PlugTarget, TxEntry};
 use ckb_types::prelude::*;
 use ckb_types::{
     bytes::Bytes,
@@ -49,7 +48,7 @@ pub(crate) fn create_load_input_data_hash_transaction(
         .build()
 }
 
-// Ensure tx-pool reject tx which calls syscall load_cell_data_hash from input
+// Ensure tx-pool accept tx which calls syscall load_cell_data_hash from input
 #[test]
 fn test_load_input_data_hash_cell() {
     let (_, _, load_input_data_hash_script) = load_input_data_hash_cell();
@@ -86,16 +85,9 @@ fn test_load_input_data_hash_cell() {
     let tx1 = create_load_input_data_hash_transaction(&tx0, 0);
 
     let tx_pool = shared.tx_pool_controller();
-    let ret = tx_pool.submit_local_tx(tx0.clone()).unwrap();
-    assert!(ret.is_err());
-    //ValidationFailure(2) missing item
-    assert!(format!("{}", ret.err().unwrap()).contains("ValidationFailure(2)"));
+    let ret = tx_pool.submit_local_tx(tx0).unwrap();
+    assert!(ret.is_ok());
 
-    let entry0 = vec![TxEntry::dummy_resolve(tx0, 0, Capacity::shannons(0), 100)];
-    tx_pool.plug_entry(entry0, PlugTarget::Proposed).unwrap();
-
-    // Ensure tx which calls syscall load_cell_data_hash will got reject even previous tx is already in tx-pool
     let ret = tx_pool.submit_local_tx(tx1).unwrap();
-    assert!(ret.is_err());
-    assert!(format!("{}", ret.err().unwrap()).contains("ValidationFailure(2)"));
+    assert!(ret.is_ok());
 }

db-migration/Cargo.toml

@@ -15,7 +15,7 @@ ckb-db = { path = "../db", version = "= 0.43.0-pre" }
 ckb-logger = { path = "../util/logger", version = "= 0.43.0-pre" }
 ckb-error = { path = "../error", version = "= 0.43.0-pre" }
 ckb-db-schema = { path = "../db-schema", version = "= 0.43.0-pre" }
-indicatif = "0.15"
+indicatif = "0.16"
 console = ">=0.9.1, <1.0.0"
 
 [dev-dependencies]

db-migration/src/lib.rs

@@ -109,8 +109,8 @@ impl Migrations {
                     let mpbc = Arc::clone(&mpb);
                     let pb = move |count: u64| -> ProgressBar {
                         let pb = mpbc.add(ProgressBar::new(count));
-                        pb.set_draw_target(ProgressDrawTarget::to_term(Term::stdout(), None));
-                        pb.set_prefix(&format!("[{}/{}]", idx + 1, migrations_count));
+                        pb.set_draw_target(ProgressDrawTarget::term(Term::stdout(), None));
+                        pb.set_prefix(format!("[{}/{}]", idx + 1, migrations_count));
                         pb
                     };
                     db = m.migrate(db, Arc::new(pb))?;
@@ -244,13 +244,13 @@ mod tests {
             ) -> Result<RocksDB, Error> {
                 let txn = db.transaction();
                 // append 1u8 to each value of column `0`
-                let migration = |key: &[u8], value: &[u8]| -> Result<(), Error> {
+                let mut migration = |key: &[u8], value: &[u8]| -> Result<(), Error> {
                     let mut new_value = value.to_vec();
                     new_value.push(1);
                     txn.put(COLUMN, key, &new_value)?;
                     Ok(())
                 };
-                db.traverse(COLUMN, migration)?;
+                db.full_traverse(COLUMN, &mut migration)?;
                 txn.commit()?;
                 Ok(db)
             }

db-schema/src/lib.rs

@@ -3,7 +3,7 @@
 /// Column families alias type
 pub type Col = &'static str;
 /// Total column number
-pub const COLUMNS: u32 = 15;
+pub const COLUMNS: u32 = 16;
 /// Column store chain index
 pub const COLUMN_INDEX: Col = "0";
 /// Column store block's header
@@ -34,9 +34,10 @@ pub const COLUMN_UNCLES: Col = "11";
 pub const COLUMN_CELL_DATA: Col = "12";
 /// Column store block number-hash pair
 pub const COLUMN_NUMBER_HASH: Col = "13";
-
+/// Column store cell data hash
+pub const COLUMN_CELL_DATA_HASH: Col = "14";
 /// Column store block extension data
-pub const COLUMN_BLOCK_EXTENSION: Col = "14";
+pub const COLUMN_BLOCK_EXTENSION: Col = "15";
 
 /// META_TIP_HEADER_KEY tracks the latest known best block header
 pub const META_TIP_HEADER_KEY: &[u8] = b"TIP_HEADER";