[ref] separate checks for block 0

lib/modules/blockchain/blockchain/src/dubp/check/mod.rs

@@ -55,16 +55,33 @@ fn invalid_rule_error(error: InvalidRuleError) -> BlockError {
     BlockError::InvalidBlock(InvalidBlockError::InvalidRule(error))
 }
 
+pub fn verify_genesis_block_validity(block: &BlockDocument) -> Result<(), BlockError> {
+    // BR_G03 - previous issuer
+    if block.previous_issuer != None {
+        return Err(invalid_rule_error(InvalidRuleError::WrongPreviousIssuer));
+    }
+
+    // BR_G04 - issuers count
+    if block.issuers_count != 0 {
+        return Err(invalid_rule_error(InvalidRuleError::WrongIssuersCount));
+    }
+
+    // BR_G05 - issuers count
+    if block.issuers_frame != 1 {
+        return Err(invalid_rule_error(InvalidRuleError::WrongIssuersFrame));
+    }
+
+    Ok(())
+}
+
 pub fn verify_block_validity<W: WebOfTrust>(
     block: &BlockDocument,
     blockchain_db: &BinDB<LocalBlockchainV10Datas>,
+    identities_db: &BinDB<IdentitiesV10Datas>,
     _certs_db: &BinDB<CertsExpirV10Datas>,
     _wot_index: &HashMap<PubKey, NodeId>,
     _wot_db: &BinDB<W>,
-    identities_db: &BinDB<IdentitiesV10Datas>,
 ) -> Result<(), BlockError> {
-    // Rules that do not concern genesis block
-    if block.number.0 > 0 {
     // Get previous block
     let previous_block_opt = readers::block::get_block_in_local_blockchain(
         blockchain_db,
@@ -102,16 +119,14 @@ pub fn verify_block_validity<W: WebOfTrust>(
     }
 
     // BR_G04 - issuers count
-        let mut issuers: Vec<PubKey> = vec![];
-        for i in (previous_block.issuers_frame as u32)..=previous_block.number.0 {
-            let issuer = readers::block::get_block_in_local_blockchain(blockchain_db, BlockId(i))?
-                .expect("safe unwrap")
-                .issuers[0];
-            if !issuers.contains(&issuer) {
-                issuers.push(issuer);
-            }
-        }
-        if issuers.len() != block.issuers_count {
+    let issuers_frame = readers::block::get_current_frame(
+        &entities::block::DALBlock {
+            block: block.clone(),
+            expire_certs: None,
+        },
+        blockchain_db,
+    )?;
+    if issuers_frame.len() != block.issuers_count {
         return Err(invalid_rule_error(InvalidRuleError::WrongIssuersCount));
     }
 
@@ -126,24 +141,6 @@ pub fn verify_block_validity<W: WebOfTrust>(
     {
         return Err(invalid_rule_error(InvalidRuleError::WrongIssuersFrame));
     }
-    }
-    // Only rules that do concern genesis block
-    else {
-        // BR_G03 - previous issuer
-        if block.previous_issuer != None {
-            return Err(invalid_rule_error(InvalidRuleError::WrongPreviousIssuer));
-        }
-
-        // BR_G04 - issuers count
-        if block.issuers_count != 0 {
-            return Err(invalid_rule_error(InvalidRuleError::WrongIssuersCount));
-        }
-
-        // BR_G05 - issuers count
-        if block.issuers_frame != 1 {
-            return Err(invalid_rule_error(InvalidRuleError::WrongIssuersFrame));
-        }
-    }
 
     Ok(())
 }

lib/modules/blockchain/blockchain/src/dubp/mod.rs

@@ -92,14 +92,18 @@ pub fn check_and_apply_block(
         )?;
 
         // Verify block validity (check all protocol rule, very long !)
+        if block_doc.number.0 == 0 {
+            verify_genesis_block_validity(&block_doc)?;
+        } else {
             verify_block_validity(
                 &block_doc,
                 &bc.blocks_databases.blockchain_db,
+                &bc.wot_databases.identities_db,
                 &bc.wot_databases.certs_db,
                 &bc.wot_index,
                 &bc.wot_databases.wot_db,
-            &bc.wot_databases.identities_db,
             )?;
+        }
 
         Ok(CheckAndApplyBlockReturn::ValidBlock(apply_valid_block(
             block_doc,