Refactor parlia-elc (#38)

Refactor Signed-off-by: Naohiro Yoshida <[email protected]>
datachainlab · Dec 17, 2023 · b5bdac9 · b5bdac9
1 parent c78c881
commit b5bdac9
Show file tree

Hide file tree

Showing 5 changed files with 364 additions and 252 deletions.
diff --git a/light-client/src/client_state.rs b/light-client/src/client_state.rs
@@ -120,11 +120,8 @@ impl ClientState {
             ));
         }
 
-        // Ensure validator set is
-        header.verify_validator_set(cs)?;
-
         // Ensure header is valid
-        header.verify(&self.chain_id)
+        header.verify(&self.chain_id, cs)
     }
 }
 

diff --git a/light-client/src/errors.rs b/light-client/src/errors.rs
@@ -70,10 +70,11 @@ pub enum Error {
     InvalidProofFormatError(Vec<u8>),
     MissingValidatorInEpochBlock(BlockNumber),
     MissingNextValidatorSet(BlockNumber),
+    MissingCurrentValidatorSet(BlockNumber),
     UnexpectedPreviousValidatorsHash(Height, Height, Hash, Hash),
     UnexpectedCurrentValidatorsHash(Height, Height, Hash, Hash),
     InvalidVerifyingHeaderLength(BlockNumber, usize),
-    ValidatorNotTrusted(Hash),
+    InsufficientTrustedValidatorsInUntrustedValidators(Hash, usize, usize),
     MissingValidatorToVerifySeal(BlockNumber),
     MissingValidatorToVerifyVote(BlockNumber),
     UnexpectedNextCheckpointHeader(BlockNumber, BlockNumber),
@@ -282,11 +283,18 @@ impl core::fmt::Display for Error {
             Error::UnexpectedVoteRelation(e1, e2, e3) => {
                 write!(f, "UnexpectedVoteRelation : {} {} {:?}", e1, e2, e3)
             }
-            Error::ValidatorNotTrusted(e1) => {
-                write!(f, "ValidatorNotTrusted : {:?}", e1)
+            Error::InsufficientTrustedValidatorsInUntrustedValidators(e1, e2, e3) => {
+                write!(
+                    f,
+                    "InsufficientTrustedValidatorsInUntrustedValidators : {:?} {} {}",
+                    e1, e2, e3
+                )
             }
             Error::MissingNextValidatorSet(e1) => {
-                write!(f, "MissingNextValidatorSet : {:?}", e1)
+                write!(f, "MissingNextValidatorSet : {}", e1)
+            }
+            Error::MissingCurrentValidatorSet(e1) => {
+                write!(f, "MissingCurrentValidatorSet : {}", e1)
             }
             Error::MissingValidatorToVerifySeal(e1) => {
                 write!(f, "MissingValidatorToVerifySeal : {:?}", e1)