fix: resolve merge errors

Author: obycode

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -28,7 +28,7 @@ use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
 use clarity::vm::{ClarityName, ClarityVersion, Value};
 use http_types::headers::AUTHORIZATION;
 use lazy_static::lazy_static;
-use libsigner::v0::messages::{RejectCode, SignerMessage as SignerMessageV0};
+use libsigner::v0::messages::{RejectReason, SignerMessage as SignerMessageV0};
 use libsigner::{SignerSession, StackerDBSession};
 use rusqlite::OptionalExtension;
 use stacks::burnchains::{MagicBytes, Txid};
@@ -6599,7 +6599,7 @@ fn signer_chainstate() {
                 .expect_err("Sortitions view should reject proposals from prior tenure");
             assert_eq!(
                 reject_code,
-                RejectCode::NotLatestSortitionWinner,
+                RejectReason::NotLatestSortitionWinner,
                 "Sortitions view should reject proposals from prior tenure"
             );
             for block in prior_tenure_interims.iter() {
@@ -6608,7 +6608,7 @@ fn signer_chainstate() {
                     .expect_err("Sortitions view should reject proposals from prior tenure");
                 assert_eq!(
                     reject_code,
-                    RejectCode::NotLatestSortitionWinner,
+                    RejectReason::NotLatestSortitionWinner,
                     "Sortitions view should reject proposals from prior tenure"
                 );
             }

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

@@ -24,7 +24,7 @@ use std::{env, thread};
 use clarity::vm::types::PrincipalData;
 use libsigner::v0::messages::{
     BlockAccepted, BlockRejection, BlockResponse, MessageSlotID, MinerSlotID, PeerInfo, RejectCode,
-    SignerMessage,
+    RejectReason, SignerMessage,
 };
 use libsigner::{
     BlockProposal, BlockProposalData, SignerSession, StackerDBSession, VERSION_STRING,
@@ -1277,15 +1277,14 @@ fn block_proposal_rejection() {
                 reason: _reason,
                 reason_code,
                 signer_signature_hash,
+                response_data,
                 ..
             })) = message
             {
                 if signer_signature_hash == block_signer_signature_hash_1 {
                     found_signer_signature_hash_1 = true;
-                    assert!(
-                        matches!(reason_code, RejectCode::InvalidBitvec),
-                        "Expected sortition view mismatch rejection. Got: {reason_code}"
-                    );
+                    assert_eq!(reason_code, RejectCode::SortitionViewMismatch,);
+                    assert_eq!(response_data.reject_reason, RejectReason::InvalidBitvec);
                 } else if signer_signature_hash == block_signer_signature_hash_2 {
                     found_signer_signature_hash_2 = true;
                     assert!(matches!(
@@ -3785,10 +3784,12 @@ fn empty_sortition() {
             if let SignerMessage::BlockResponse(BlockResponse::Rejected(BlockRejection {
                 reason_code,
                 metadata,
+                response_data,
                 ..
             })) = latest_msg
             {
-                assert!(matches!(reason_code, RejectCode::InvalidMiner));
+                assert_eq!(reason_code, RejectCode::SortitionViewMismatch);
+                assert_eq!(response_data.reject_reason, RejectReason::InvalidMiner);
                 assert_eq!(metadata.server_version, VERSION_STRING.to_string());
                 found_rejections.push(*slot_id);
             } else {