Skip to content

Commit fe7c4a2

Browse files
foriequal0mergify[bot]
authored andcommitted
Remove unused on_new_block
`on_new_block` does nothing after removing `on_epoch_begin`
1 parent 14782d9 commit fe7c4a2

File tree

4 files changed

+0
-32
lines changed

4 files changed

+0
-32
lines changed

core/src/block.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ impl<'x> OpenBlock<'x> {
149149
engine.machine().populate_from_parent(&mut r.block.header, parent);
150150
engine.populate_from_parent(&mut r.block.header, parent);
151151

152-
engine.on_new_block(&mut r.block)?;
153-
154152
Ok(r)
155153
}
156154

core/src/consensus/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,6 @@ pub trait ConsensusEngine: Sync + Send {
221221
/// Stops any services that the may hold the Engine and makes it safe to drop.
222222
fn stop(&self) {}
223223

224-
/// Block transformation functions, before the transactions.
225-
fn on_new_block(&self, _block: &mut ExecutedBlock) -> Result<(), Error> {
226-
Ok(())
227-
}
228-
229224
/// Block transformation functions, after the transactions.
230225
fn on_close_block(&self, _block: &mut ExecutedBlock) -> Result<(), Error> {
231226
Ok(())

core/src/consensus/tendermint/engine.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,6 @@ impl ConsensusEngine for Tendermint {
143143

144144
fn stop(&self) {}
145145

146-
fn on_new_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
147-
let (result, receiver) = crossbeam::bounded(1);
148-
self.inner
149-
.send(worker::Event::OnNewBlock {
150-
header: Box::from(block.header().clone()),
151-
result,
152-
})
153-
.unwrap();
154-
receiver.recv().unwrap()
155-
}
156-
157146
fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
158147
let author = *block.header().author();
159148
let (total_fee, min_fee) = {

core/src/consensus/tendermint/worker.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ pub enum Event {
117117
result: crossbeam::Sender<U256>,
118118
},
119119
OnTimeout(usize),
120-
OnNewBlock {
121-
header: Box<Header>,
122-
result: crossbeam::Sender<Result<(), Error>>,
123-
},
124120
HandleMessages {
125121
messages: Vec<Vec<u8>>,
126122
result: crossbeam::Sender<Result<(), EngineError>>,
@@ -266,12 +262,6 @@ impl Worker {
266262
Ok(Event::OnTimeout(token)) => {
267263
inner.on_timeout(token);
268264
}
269-
Ok(Event::OnNewBlock {
270-
header,
271-
result,
272-
}) => {
273-
result.send(inner.on_new_block(&header)).unwrap();
274-
}
275265
Ok(Event::HandleMessages {
276266
messages,
277267
result,
@@ -1254,10 +1244,6 @@ impl Worker {
12541244
nonce < self.timeout_token_nonce
12551245
}
12561246

1257-
fn on_new_block(&self, _header: &Header) -> Result<(), Error> {
1258-
Ok(())
1259-
}
1260-
12611247
fn handle_message(&mut self, rlp: &[u8], is_restoring: bool) -> Result<(), EngineError> {
12621248
fn fmt_err<T: ::std::fmt::Debug>(x: T) -> EngineError {
12631249
EngineError::MalformedMessage(format!("{:?}", x))

0 commit comments

Comments
 (0)