Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-05-03 07:41:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compiler warning 'unnecessary parentheses around type' ()

Browse source
This commit is contained in:
Quentin Le Sceller 2020-01-06 04:53:49 -05:00 • committed by Antioch Peverell
parent 2bf4080866
commit d31427f694
3 changed files with 6 additions and 6 deletions
chain/src/txhashset
txhashset.rs
core/src/core
committed.rs
store/src
pmmr.rs

6
chain/src/txhashset/txhashset.rs
View file

@ -1008,7 +1008,7 @@ impl<'a> Extension<'a> {
} }
} }
fn apply_output(&mut self, out: &Output) -> Result<(u64), Error> { fn apply_output(&mut self, out: &Output) -> Result<u64, Error> {
let commit = out.commitment(); let commit = out.commitment();
if let Ok(pos) = self.batch.get_output_pos(&commit) { if let Ok(pos) = self.batch.get_output_pos(&commit) {
@ -1229,7 +1229,7 @@ impl<'a> Extension<'a> {
pub fn validate_kernel_sums( pub fn validate_kernel_sums(
&self, &self,
genesis: &BlockHeader, genesis: &BlockHeader,
) -> Result<((Commitment, Commitment)), Error> { ) -> Result<(Commitment, Commitment), Error> {
let now = Instant::now(); let now = Instant::now();
let head_header = self.batch.get_block_header(&self.head.last_block_h)?; let head_header = self.batch.get_block_header(&self.head.last_block_h)?;
@ -1253,7 +1253,7 @@ impl<'a> Extension<'a> {
genesis: &BlockHeader, genesis: &BlockHeader,
fast_validation: bool, fast_validation: bool,
status: &dyn TxHashsetWriteStatus, status: &dyn TxHashsetWriteStatus,
) -> Result<((Commitment, Commitment)), Error> { ) -> Result<(Commitment, Commitment), Error> {
self.validate_mmrs()?; self.validate_mmrs()?;
self.validate_roots()?; self.validate_roots()?;
self.validate_sizes()?; self.validate_sizes()?;

2
core/src/core/committed.rs
View file

@ -124,7 +124,7 @@ pub trait Committed {
&self, &self,
overage: i64, overage: i64,
kernel_offset: BlindingFactor, kernel_offset: BlindingFactor,
) -> Result<((Commitment, Commitment)), Error> { ) -> Result<(Commitment, Commitment), Error> {
// Sum all input|output|overage commitments. // Sum all input|output|overage commitments.
let utxo_sum = self.sum_commitments(overage)?; let utxo_sum = self.sum_commitments(overage)?;

4
store/src/pmmr.rs
View file

@ -110,7 +110,7 @@ impl<T: PMMRable> Backend<T> for PMMRBackend<T> {
/// Get the hash at pos. /// Get the hash at pos.
/// Return None if pos is a leaf and it has been removed (or pruned or /// Return None if pos is a leaf and it has been removed (or pruned or
/// compacted). /// compacted).
fn get_hash(&self, pos: u64) -> Option<(Hash)> { fn get_hash(&self, pos: u64) -> Option<Hash> {
if self.prunable && pmmr::is_leaf(pos) && !self.leaf_set.includes(pos) { if self.prunable && pmmr::is_leaf(pos) && !self.leaf_set.includes(pos) {
return None; return None;
} }
@ -119,7 +119,7 @@ impl<T: PMMRable> Backend<T> for PMMRBackend<T> {
/// Get the data at pos. /// Get the data at pos.
/// Return None if it has been removed or if pos is not a leaf node. /// Return None if it has been removed or if pos is not a leaf node.
fn get_data(&self, pos: u64) -> Option<(T::E)> { fn get_data(&self, pos: u64) -> Option<T::E> {
if !pmmr::is_leaf(pos) { if !pmmr::is_leaf(pos) {
return None; return None;
} }