Skip to content

Commit

Permalink
txhashset: remove unnecessary mutability from self references in gett…
Browse files Browse the repository at this point in the history
…ers (#2844)

* txhashset.rs: make self references immutable in getters

* rustfmt
  • Loading branch information
eupn authored and antiochp committed May 25, 2019
1 parent 9f28e6a commit a2a350d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions chain/src/txhashset/txhashset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ impl<'a> HeaderExtension<'a> {
/// Get the header at the specified height based on the current state of the header extension.
/// Derives the MMR pos from the height (insertion index) and retrieves the header hash.
/// Looks the header up in the db by hash.
pub fn get_header_by_height(&mut self, height: u64) -> Result<BlockHeader, Error> {
pub fn get_header_by_height(&self, height: u64) -> Result<BlockHeader, Error> {
let pos = pmmr::insertion_to_pmmr_index(height + 1);
if let Some(hash) = self.get_header_hash(pos) {
let header = self.batch.get_block_header(&hash)?;
Expand All @@ -654,7 +654,7 @@ impl<'a> HeaderExtension<'a> {

/// Compares the provided header to the header in the header MMR at that height.
/// If these match we know the header is on the current chain.
pub fn is_on_current_chain(&mut self, header: &BlockHeader) -> Result<(), Error> {
pub fn is_on_current_chain(&self, header: &BlockHeader) -> Result<(), Error> {
let chain_header = self.get_header_by_height(header.height)?;
if chain_header.hash() == header.hash() {
Ok(())
Expand Down Expand Up @@ -949,7 +949,9 @@ impl<'a> Extension<'a> {
}

if output_pos != rproof_pos {
return Err(ErrorKind::Other(format!("output vs rproof MMRs different pos")).into());
return Err(
ErrorKind::Other(format!("output vs rproof MMRs different pos")).into(),
);
}
}

Expand Down Expand Up @@ -991,7 +993,7 @@ impl<'a> Extension<'a> {

/// Compares the provided header to the header in the header MMR at that height.
/// If these match we know the header is on the current chain.
pub fn is_on_current_chain(&mut self, header: &BlockHeader) -> Result<(), Error> {
pub fn is_on_current_chain(&self, header: &BlockHeader) -> Result<(), Error> {
let chain_header = self.get_header_by_height(header.height)?;
if chain_header.hash() == header.hash() {
Ok(())
Expand Down

0 comments on commit a2a350d

Please sign in to comment.