gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-02 04:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Option from terminal_block_hash in EL

Browse Source
This commit is contained in:
Paul Hauner
2021-09-28 14:29:20 +10:00
parent 1135a8f783
commit 137a9fd3a7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/execution_layer/src/lib.rs
View File

@@ -36,7 +36,7 @@ impl From<ApiError> for Error {
struct Inner { struct Inner {
engines: Engines<HttpJsonRpc>, engines: Engines<HttpJsonRpc>,
terminal_total_difficulty: Uint256, terminal_total_difficulty: Uint256,
terminal_block_hash: Option<Hash256>, terminal_block_hash: Hash256,
fee_recipient: Option<Address>, fee_recipient: Option<Address>,
execution_blocks: Mutex<LruCache<Hash256, ExecutionBlock>>, execution_blocks: Mutex<LruCache<Hash256, ExecutionBlock>>,
executor: TaskExecutor, executor: TaskExecutor,
@@ -52,7 +52,7 @@ impl ExecutionLayer {
pub fn from_urls( pub fn from_urls(
urls: Vec<SensitiveUrl>, urls: Vec<SensitiveUrl>,
terminal_total_difficulty: Uint256, terminal_total_difficulty: Uint256,
terminal_block_hash: Option<Hash256>, terminal_block_hash: Hash256,
fee_recipient: Option<Address>, fee_recipient: Option<Address>,
executor: TaskExecutor, executor: TaskExecutor,
log: Logger, log: Logger,
@@ -98,7 +98,7 @@ impl ExecutionLayer {
self.inner.terminal_total_difficulty self.inner.terminal_total_difficulty
} }
fn terminal_block_hash(&self) -> Option<Hash256> { fn terminal_block_hash(&self) -> Hash256 {
self.inner.terminal_block_hash self.inner.terminal_block_hash
} }
@@ -386,7 +386,7 @@ impl ExecutionLayer {
} }
fn is_valid_terminal_pow_block(&self, block: ExecutionBlock, parent: ExecutionBlock) -> bool { fn is_valid_terminal_pow_block(&self, block: ExecutionBlock, parent: ExecutionBlock) -> bool {
if Some(block.block_hash) == self.terminal_block_hash() { if block.block_hash == self.terminal_block_hash() {
return true; return true;
} }