fmt code

light-clients/ics07-tendermint/src/lib.rs

@@ -42,11 +42,11 @@ pub mod client_state;
 pub mod consensus_state;
 pub mod error;
 pub mod merkle;
-pub mod utils;
 #[cfg(any(test, feature = "mocks"))]
 pub mod mock;
 #[cfg(any(test, feature = "mocks"))]
 mod query;
+pub mod utils;
 
 /// Host functions that allow the light client verify cryptographic proofs in native.
 pub trait HostFunctionsProvider:

light-clients/ics07-tendermint/src/utils.rs

@@ -1,70 +1,85 @@
-use tendermint::{block::{signed_header::SignedHeader, Commit, CommitSig}, signature::Signature, PublicKey, crypto::default::signature::Verifier};
+use tendermint::{
+	block::{signed_header::SignedHeader, Commit, CommitSig},
+	crypto::default::signature::Verifier,
+	signature::Signature,
+	PublicKey,
+};
 
 use crate::client_message::Header;
 
 use tendermint::crypto::signature::Verifier as _;
 
-
-
 /// Utilty function that:
 /// - collects {signature, pubkey, msg} from every validator that successfuly signed a block so that
 /// - there's consensus (voting power > 2/3) and
-/// - size of the validators that succesfully voted equals the circuit size 
+/// - size of the validators that succesfully voted equals the circuit size
 
-pub fn collect_signatures_for_finalized_block(header: Header, circuit_size: usize) -> Option<Vec<(PublicKey, Signature, Vec<u8>)>> {
+pub fn collect_signatures_for_finalized_block(
+	header: Header,
+	circuit_size: usize,
+) -> Option<Vec<(PublicKey, Signature, Vec<u8>)>> {
+	let Header {
+		validator_set,
+		signed_header: SignedHeader { header, commit: Commit { signatures, .. }, .. },
+		..
+	} = header;
 
-    let Header {validator_set,
-        signed_header: SignedHeader{
-            header, commit: Commit{signatures, ..}
-            ,..}, ..
-   } = header;
+	let total_voting_power = validator_set.total_voting_power().value();
 
-    let total_voting_power = validator_set.total_voting_power().value();
+	// 1. order by voting power
 
-    // 1. order by voting power
-
-    // filter by valid signatures
-    let mut validator_info_signed_block = signatures.iter().filter(|commit| matches!(commit, CommitSig::BlockIdFlagCommit{..}))
-    .flat_map(|commit| match commit {
-        CommitSig::BlockIdFlagCommit { validator_address,  signature, .. } if signature.is_some() => {
-            match validator_set.validators().iter().find(|info| *validator_address == info.address ) {
-                None => None,
-                Some(info) => Some((info.pub_key, signature.clone().unwrap(), commit, info.power))
-            }
-
-        }
-    _ => unreachable!()
-    }
-    )
-    .collect::<Vec<_>>();
+	// filter by valid signatures
+	let mut validator_info_signed_block = signatures
+		.iter()
+		.filter(|commit| matches!(commit, CommitSig::BlockIdFlagCommit { .. }))
+		.flat_map(|commit| match commit {
+			CommitSig::BlockIdFlagCommit { validator_address, signature, .. }
+				if signature.is_some() =>
+			{
+				match validator_set
+					.validators()
+					.iter()
+					.find(|info| *validator_address == info.address)
+				{
+					None => None,
+					Some(info) =>
+						Some((info.pub_key, signature.clone().unwrap(), commit, info.power)),
+				}
+			},
+			_ => unreachable!(),
+		})
+		.collect::<Vec<_>>();
 
-// order by power DESC
-validator_info_signed_block.sort_by(|(_, _, _, power_a), (_, _, _, power_b)| power_b.value().cmp(&power_a.value()));
+	// order by power DESC
+	validator_info_signed_block
+		.sort_by(|(_, _, _, power_a), (_, _, _, power_b)| power_b.value().cmp(&power_a.value()));
 
-let result = validator_info_signed_block.into_iter().fold((0u64, vec![]), |mut acc, (pubkey, signature, _commit, power)| {
-        if acc.0 * 3 > 2*total_voting_power && acc.1.len() == circuit_size {
-            acc
-        } else {
-            // TOOD: commit has to become bytes, I guess? How to do so?
-            // let msg = commit;
-            let msg = vec![0u8];
+	let result = validator_info_signed_block.into_iter().fold(
+		(0u64, vec![]),
+		|mut acc, (pubkey, signature, _commit, power)| {
+			if acc.0 * 3 > 2 * total_voting_power && acc.1.len() == circuit_size {
+				acc
+			} else {
+				// TOOD: commit has to become bytes, I guess? How to do so?
+				// let msg = commit;
+				let msg = vec![0u8];
 
-            if Verifier::verify(pubkey, msg.as_ref(), &signature).is_ok() {
-                    acc.1.push((pubkey, signature, msg.to_vec()));
-                    acc.0 +=  power.value();    
-            }
-            acc
-        }
-        
-    });
+				if Verifier::verify(pubkey, msg.as_ref(), &signature).is_ok() {
+					acc.1.push((pubkey, signature, msg.to_vec()));
+					acc.0 += power.value();
+				}
+				acc
+			}
+		},
+	);
 
-if result.0 * 3 > 2*total_voting_power && result.1.len() == circuit_size {
-    Some(result.1)
-} else {
-    None
-}
+	if result.0 * 3 > 2 * total_voting_power && result.1.len() == circuit_size {
+		Some(result.1)
+	} else {
+		None
+	}
 }
 
 // fn check_block_is_final() {
 
-// }
+// }