From 31afa3a1c7d408675ece9740da25b67fc0ac608c Mon Sep 17 00:00:00 2001 From: arya2 Date: Tue, 10 Jan 2023 12:38:30 -0500 Subject: [PATCH] Applies cleanup suggestions from code review --- zebra-rpc/src/methods/get_block_template_rpcs/constants.rs | 5 +++++ zebra-state/src/service/check.rs | 4 ++-- zebra-state/src/service/write.rs | 4 +--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/zebra-rpc/src/methods/get_block_template_rpcs/constants.rs b/zebra-rpc/src/methods/get_block_template_rpcs/constants.rs index 2c0e7814e44..712be0066e8 100644 --- a/zebra-rpc/src/methods/get_block_template_rpcs/constants.rs +++ b/zebra-rpc/src/methods/get_block_template_rpcs/constants.rs @@ -26,6 +26,11 @@ pub const GET_BLOCK_TEMPLATE_MUTABLE_FIELD: &[&str] = &[ ]; /// A hardcoded list of Zebra's getblocktemplate RPC capabilities. +/// +/// See: +/// - +/// - +/// - pub const GET_BLOCK_TEMPLATE_CAPABILITIES_FIELD: &[&str] = &["proposal"]; /// The max estimated distance to the chain tip for the getblocktemplate method. diff --git a/zebra-state/src/service/check.rs b/zebra-state/src/service/check.rs index 603eb4f3e8d..0b3600ad89b 100644 --- a/zebra-state/src/service/check.rs +++ b/zebra-state/src/service/check.rs @@ -14,13 +14,13 @@ use zebra_chain::{ use crate::{ service::{ block_iter::any_ancestor_blocks, check::difficulty::POW_ADJUSTMENT_BLOCK_SPAN, - non_finalized_state::NonFinalizedState, + finalized_state::ZebraDb, non_finalized_state::NonFinalizedState, }, BoxError, PreparedBlock, ValidateContextError, }; // use self as check -use super::{check, finalized_state::ZebraDb}; +use super::check; // These types are used in doc links #[allow(unused_imports)] diff --git a/zebra-state/src/service/write.rs b/zebra-state/src/service/write.rs index 7b91c09227c..8f33af7b6d1 100644 --- a/zebra-state/src/service/write.rs +++ b/zebra-state/src/service/write.rs @@ -12,7 +12,7 @@ use crate::{ constants::MAX_BLOCK_REORG_HEIGHT, service::{ check, - finalized_state::FinalizedState, + finalized_state::{FinalizedState, ZebraDb}, non_finalized_state::NonFinalizedState, queued_blocks::{QueuedFinalized, QueuedNonFinalized}, BoxError, ChainTipBlock, ChainTipSender, CloneError, @@ -27,8 +27,6 @@ use crate::service::{ non_finalized_state::Chain, }; -use super::finalized_state::ZebraDb; - /// The maximum size of the parent error map. /// /// We allow enough space for multiple concurrent chain forks with errors.