reverted RejectCode::ReorgNotAllowed

Author: rdeioris

libsigner/src/v0/messages.rs

@@ -539,9 +539,7 @@ RejectCodeTypePrefix {
     /// The block was rejected due to a mismatch with expected sortition view
     SortitionViewMismatch = 4,
     /// The block was rejected due to a testing directive
-    TestingDirective = 5,
-    /// The block was rejected due to an invalid reorg attempt
-    ReorgNotAllowed = 6
+    TestingDirective = 5
 });
 
 impl TryFrom<u8> for RejectCodeTypePrefix {
@@ -562,7 +560,6 @@ impl From<&RejectCode> for RejectCodeTypePrefix {
             RejectCode::NoSortitionView => RejectCodeTypePrefix::NoSortitionView,
             RejectCode::SortitionViewMismatch => RejectCodeTypePrefix::SortitionViewMismatch,
             RejectCode::TestingDirective => RejectCodeTypePrefix::TestingDirective,
-            RejectCode::ReorgNotAllowed => RejectCodeTypePrefix::ReorgNotAllowed,
         }
     }
 }
@@ -605,8 +602,6 @@ pub enum RejectCode {
     SortitionViewMismatch,
     /// The block was rejected due to a testing directive
     TestingDirective,
-    /// The block was rejected due to an invalid reorg attempt
-    ReorgNotAllowed,
 }
 
 impl From<&RejectReason> for RejectCode {
@@ -620,7 +615,7 @@ impl From<&RejectReason> for RejectCode {
             RejectReason::RejectedInPriorRound => RejectCode::RejectedInPriorRound,
             RejectReason::SortitionViewMismatch => RejectCode::SortitionViewMismatch,
             RejectReason::TestingDirective => RejectCode::TestingDirective,
-            RejectReason::ReorgNotAllowed => RejectCode::ReorgNotAllowed,
+            RejectReason::ReorgNotAllowed => RejectCode::SortitionViewMismatch,
             // Newer reject reasons were expanded from SortitionViewMismatch
             _ => RejectCode::SortitionViewMismatch,
         }
@@ -767,7 +762,6 @@ impl From<&RejectCode> for RejectReason {
             RejectCode::NoSortitionView => RejectReason::NoSortitionView,
             RejectCode::SortitionViewMismatch => RejectReason::SortitionViewMismatch,
             RejectCode::TestingDirective => RejectReason::TestingDirective,
-            RejectCode::ReorgNotAllowed => RejectReason::ReorgNotAllowed,
         }
     }
 }
@@ -1278,8 +1272,7 @@ impl StacksMessageCodec for RejectCode {
             | RejectCode::RejectedInPriorRound
             | RejectCode::NoSortitionView
             | RejectCode::SortitionViewMismatch
-            | RejectCode::TestingDirective
-            | RejectCode::ReorgNotAllowed => {
+            | RejectCode::TestingDirective => {
                 // No additional data to serialize / deserialize
             }
         };
@@ -1305,7 +1298,6 @@ impl StacksMessageCodec for RejectCode {
             RejectCodeTypePrefix::NoSortitionView => RejectCode::NoSortitionView,
             RejectCodeTypePrefix::SortitionViewMismatch => RejectCode::SortitionViewMismatch,
             RejectCodeTypePrefix::TestingDirective => RejectCode::TestingDirective,
-            RejectCodeTypePrefix::ReorgNotAllowed => RejectCode::ReorgNotAllowed,
         };
         Ok(code)
     }
@@ -1397,9 +1389,6 @@ impl std::fmt::Display for RejectCode {
             RejectCode::TestingDirective => {
                 write!(f, "The block was rejected due to a testing directive.")
             }
-            RejectCode::ReorgNotAllowed => {
-                write!(f, "The block was rejected due to an invalid reorg attempt.")
-            }
         }
     }
 }

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

@@ -10320,7 +10320,7 @@ fn disallow_reorg_within_first_proposal_burn_block_timing_secs_but_more_than_one
         30,
         proposed_block.header.signer_signature_hash(),
         num_signers,
-        RejectCode::ReorgNotAllowed,
+        RejectCode::SortitionViewMismatch,
     )
     .expect("Timed out waiting for a block proposal to be rejected due to invalid reorg");