CRC: cleanup comments, add debug line, and use helper StacksAddress::p2pkh

Signed-off-by: Jacinta Ferrant <jacinta.ferrant@gmail.com>

Author: jferrant

stacks-signer/src/v0/signer_state.rs

@@ -30,7 +30,7 @@ use stacks_common::codec::Error as CodecError;
 use stacks_common::types::chainstate::{ConsensusHash, StacksBlockId, TrieHash};
 use stacks_common::util::hash::{Hash160, Sha512Trunc256Sum};
 use stacks_common::util::secp256k1::MessageSignature;
-use stacks_common::{info, warn};
+use stacks_common::{debug, info, warn};
 
 use crate::chainstate::{
     ProposalEvalConfig, SignerChainstateError, SortitionState, SortitionsView,
@@ -435,7 +435,7 @@ impl LocalStateMachine {
             self.try_into_update_message_with_version(version);
         match update {
             Ok(update) => {
-                info!("SENDING SIGNER UPDATE MESSAGE HERE: {update:?}");
+                debug!("Sending signer update message to stackerdb: {update:?}");
                 if let Err(e) = stackerdb.send_message_with_retry::<SignerMessage>(update.into()) {
                     warn!("Failed to send signer update to stacker-db: {e:?}",);
                 }

stacks-signer/src/v0/tests.rs

@@ -28,7 +28,7 @@ use super::signer::Signer;
 use super::signer_state::SUPPORTED_SIGNER_PROTOCOL_VERSION;
 use crate::signerdb::BlockInfo;
 
-/// A global variable that can be used to reject all block proposals if the signer's public key is in the provided list
+/// A global variable that can be used to pin a signer's highest supported protocol version if the signer's public key is in the provided list
 pub static TEST_PIN_SUPPORTED_SIGNER_PROTOCOL_VERSION: LazyLock<
     TestFlag<HashMap<StacksPublicKey, u64>>,
 > = LazyLock::new(TestFlag::default);

testnet/stacks-node/src/tests/signer/v0.rs

@@ -34,7 +34,7 @@ use pinny::tag;
 use proptest::prelude::Strategy;
 use rand::{thread_rng, Rng};
 use rusqlite::Connection;
-use stacks::address::{AddressHashMode, C32_ADDRESS_VERSION_TESTNET_SINGLESIG};
+use stacks::address::AddressHashMode;
 use stacks::burnchains::Txid;
 use stacks::chainstate::burn::db::sortdb::SortitionDB;
 use stacks::chainstate::burn::operations::LeaderBlockCommitOp;
@@ -1442,15 +1442,7 @@ pub fn wait_for_state_machine_update(
 ) -> Result<(), String> {
     let addresses: Vec<_> = signer_keys
         .iter()
-        .map(|key| {
-            StacksAddress::from_public_keys(
-                C32_ADDRESS_VERSION_TESTNET_SINGLESIG,
-                &AddressHashMode::SerializeP2PKH,
-                1,
-                &vec![*key],
-            )
-            .unwrap()
-        })
+        .map(|key| StacksAddress::p2pkh(false, &key))
         .collect();
 
     wait_for(timeout_secs, || {
@@ -14547,11 +14539,6 @@ fn rollover_signer_protocol_version() {
         .take(num_signers * 2 / 10)
         .cloned()
         .collect();
-    let non_pinned_signers: Vec<_> = all_signers
-        .iter()
-        .skip(num_signers * 2 / 10)
-        .cloned()
-        .collect();
     let pinned_signers_versions: HashMap<StacksPublicKey, u64> = pinned_signers
         .iter()
         .map(|signer| (*signer, downgraded_version))