From 2bda6e8e6d3bb04d7897b40784a314fce30486f3 Mon Sep 17 00:00:00 2001 From: hu55a1n1 Date: Sat, 30 Dec 2023 13:45:53 -0800 Subject: [PATCH] Impl Default instead of new() for CwVerifier --- utils/cw-proof/src/proof/cw.rs | 2 +- utils/cw-proof/src/verifier/cw.rs | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/utils/cw-proof/src/proof/cw.rs b/utils/cw-proof/src/proof/cw.rs index f464875..7ceea90 100644 --- a/utils/cw-proof/src/proof/cw.rs +++ b/utils/cw-proof/src/proof/cw.rs @@ -67,7 +67,7 @@ where let Self { proof, key, value } = self; let proofs = convert_tm_to_ics_merkle_proof(&proof)?; - let cw_verifier = CwVerifier::new(); + let cw_verifier = CwVerifier::default(); cw_verifier.verify( &into_array_of_size_2(proofs)?, &root, diff --git a/utils/cw-proof/src/verifier/cw.rs b/utils/cw-proof/src/verifier/cw.rs index a58fc50..98aa677 100644 --- a/utils/cw-proof/src/verifier/cw.rs +++ b/utils/cw-proof/src/verifier/cw.rs @@ -9,14 +9,6 @@ use crate::verifier::{ics23::Ics23MembershipVerifier, multi::MultiVerifier, Veri pub struct CwVerifier(MultiVerifier, Vec>, 2>); impl CwVerifier { - pub fn new() -> Self { - let mv = MultiVerifier::new([ - Ics23MembershipVerifier::new(ics23::iavl_spec()), - Ics23MembershipVerifier::new(ics23::tendermint_spec()), - ]); - Self(mv) - } - pub fn verify( &self, proofs: &[CommitmentProof; 2], @@ -36,3 +28,13 @@ impl CwVerifier { Ok(()) } } + +impl Default for CwVerifier { + fn default() -> Self { + let mv = MultiVerifier::new([ + Ics23MembershipVerifier::new(ics23::iavl_spec()), + Ics23MembershipVerifier::new(ics23::tendermint_spec()), + ]); + Self(mv) + } +}