improve get_globally_accepted_block_count_in_tenure to trigger Error only if the consensus_hash does not exist

Author: rdeioris

stacks-signer/src/signerdb.rs

@@ -858,15 +858,15 @@ impl SignerDb {
         &self,
         tenure: &ConsensusHash,
     ) -> Result<u64, DBError> {
-        let query = "SELECT COALESCE((MAX(stacks_height) - MIN(stacks_height) + 1), 0) AS block_count FROM blocks WHERE consensus_hash = ?1 AND state = ?2";
+        let query = "SELECT COALESCE((MAX(stacks_height) - MIN(stacks_height) + 1), 0), (SELECT COUNT(consensus_hash) FROM blocks WHERE consensus_hash = ?1) FROM blocks WHERE consensus_hash = ?1 AND state = ?2";
         let args = params![tenure, &BlockState::GloballyAccepted.to_string()];
-        let block_count_opt: Option<u64> = query_row(&self.db, query, args)?;
+        let block_count_opt: Option<(u64, u64)> = query_row(&self.db, query, args)?;
         match block_count_opt {
-            Some(block_count) => {
-                if block_count > 0 {
-                    Ok(block_count)
-                } else {
+            Some((block_count, tenure_count)) => {
+                if tenure_count == 0 {
                     Err(DBError::NotFoundError)
+                } else {
+                    Ok(block_count)
                 }
             }
             None => Err(DBError::NotFoundError),
@@ -2080,15 +2080,16 @@ mod tests {
             DBError::NotFoundError
         ));
 
+        // locally accepted will return 0 (instead of DBError::NotFoundError) as the tenure is valid
         block_info.signed_over = true;
-        block_info.state = BlockState::GloballyAccepted;
+        block_info.state = BlockState::LocallyAccepted;
         block_info.block.header.chain_length = 1;
         db.insert_block(&block_info).unwrap();
 
         assert_eq!(
             db.get_globally_accepted_block_count_in_tenure(&consensus_hash_1)
                 .unwrap(),
-            1
+            0
         );
 
         block_info.signed_over = true;
@@ -2104,7 +2105,7 @@ mod tests {
         assert_eq!(
             db.get_globally_accepted_block_count_in_tenure(&consensus_hash_1)
                 .unwrap(),
-            3
+            2
         );
 
         // add an unsigned block
@@ -2116,7 +2117,7 @@ mod tests {
         assert_eq!(
             db.get_globally_accepted_block_count_in_tenure(&consensus_hash_1)
                 .unwrap(),
-            4
+            3
         );
 
         // add a locally signed block
@@ -2128,7 +2129,7 @@ mod tests {
         assert_eq!(
             db.get_globally_accepted_block_count_in_tenure(&consensus_hash_1)
                 .unwrap(),
-            4
+            3
         );
     }