completed rebase to develop

Author: rdeioris

stackslib/src/net/api/getblockbyheight.rs

@@ -25,9 +25,6 @@ use stacks_common::types::chainstate::{ConsensusHash, StacksBlockId};
 use stacks_common::types::net::PeerHost;
 use {serde, serde_json};
 
-use crate::chainstate::nakamoto::{
-    NakamotoBlock, NakamotoChainState, NakamotoStagingBlocksConn, StacksDBIndexed,
-};
 use crate::chainstate::nakamoto::{
     NakamotoBlock, NakamotoChainState, NakamotoStagingBlocksConn, StacksDBIndexed,
 };
@@ -127,13 +124,6 @@ impl RPCRequestHandler for RPCNakamotoBlockByHeightRequestHandler {
             }
         };
 
-        let tip = match node.load_stacks_chain_tip(&preamble, &contents) {
-            Ok(tip) => tip,
-            Err(error_resp) => {
-                return error_resp.try_into_contents().map_err(NetError::from);
-            }
-        };
-
         let index_block_hash_res =
             node.with_node_state(|_network, _sortdb, chainstate, _mempool, _rpc_args| {
                 chainstate

stackslib/src/net/api/tests/mod.rs

@@ -61,8 +61,6 @@ mod getattachmentsinv;
 mod getblock;
 mod getblock_v3;
 mod getblockbyheight;
-mod getblockbyhash;
-mod getblockbyheight;
 mod getconstantval;
 mod getcontractabi;
 mod getcontractsrc;
@@ -206,10 +204,6 @@ pub struct TestRPC<'a> {
     pub tip_hash: BlockHeaderHash,
     /// block height of the chain tip
     pub tip_height: u64,
-    /// block header hash of the chain tip
-    pub tip_hash: BlockHeaderHash,
-    /// block height of the chain tip
-    pub tip_height: u64,
     /// consensus hash of the chain tip
     pub consensus_hash: ConsensusHash,
     /// hash of last microblock
@@ -927,8 +921,6 @@ impl<'a> TestRPC<'a> {
             consensus_hash: nakamoto_tip.consensus_hash.clone(),
             tip_hash: nakamoto_tip.anchored_header.block_hash(),
             tip_height: nakamoto_tip.stacks_block_height,
-            tip_hash: nakamoto_tip.anchored_header.block_hash(),
-            tip_height: nakamoto_tip.stacks_block_height,
             microblock_tip_hash: BlockHeaderHash([0x00; 32]),
             mempool_txids: vec![],
             microblock_txids: vec![],