fix: Rebase fixes

nervosnetwork · Sep 19, 2019 · e1634a0 · e1634a0
1 parent 22af342
commit e1634a0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/tx-pool/src/block_assembler/mod.rs b/tx-pool/src/block_assembler/mod.rs
@@ -208,7 +208,7 @@ impl BlockAssembler {
             }
             let parent_hash = uncle.header().parent_hash();
             if &uncle.difficulty() != current_epoch_ext.difficulty()
-                || uncle.epoch() != epoch_number
+                || uncle.epoch().number() != epoch_number
                 || snapshot.get_block_number(&uncle.hash()).is_some()
                 || snapshot.is_uncle(&uncle.hash())
                 || !(uncles.iter().any(|u| u.hash() == parent_hash)

diff --git a/tx-pool/src/process/block_template.rs b/tx-pool/src/process/block_template.rs
@@ -288,7 +288,10 @@ impl Future for BlockTemplateBuilder {
                 difficulty: self.current_epoch.difficulty().clone(),
                 current_time: current_time.into(),
                 number: candidate_number.into(),
-                epoch: self.current_epoch.number().into(),
+                epoch: self
+                    .current_epoch
+                    .number_with_fraction(candidate_number)
+                    .into(),
                 parent_hash: tip_hash.unpack(),
                 cycles_limit: cycles_limit.into(),
                 bytes_limit: bytes_limit.into(),

diff --git a/tx-pool/src/process/submit_txs.rs b/tx-pool/src/process/submit_txs.rs
@@ -293,7 +293,7 @@ fn verify_rtxs(
                     &tx,
                     snapshot,
                     tip_number + 1,
-                    epoch_number,
+                    epoch_number.clone(),
                     tip_header.hash(),
                     consensus,
                 )
@@ -304,7 +304,7 @@ fn verify_rtxs(
                     &tx,
                     snapshot,
                     tip_number + 1,
-                    epoch_number,
+                    epoch_number.clone(),
                     tip_header.hash(),
                     consensus,
                     snapshot,