Drop commented out code, reoder tests

Author: anodar

crates/node/src/providers/verify_foreign_tx/sign.rs

@@ -428,6 +428,35 @@ mod tests {
         )])
     }
 
+    #[test]
+    fn build_signature_request__should_reject_payload_not_matching_expected_hash() {
+        // Given
+        let request = verify_foreign_tx_request(Some(dtos::Hash256([1u8; 32])));
+        let payload = bitcoin_payload();
+
+        // When
+        let result = build_signature_request(&request, &payload);
+
+        // Then
+        let error = result.unwrap_err().to_string();
+        assert!(
+            error.contains("does not match the request's expected payload hash"),
+            "expected the payload hash mismatch error, got: {error}",
+        );
+    }
+
+    #[test]
+    fn build_signature_request__should_accept_any_payload_without_expected_hash() {
+        // Given
+        let request = verify_foreign_tx_request(None);
+
+        // When
+        let result = build_signature_request(&request, &bitcoin_payload());
+
+        // Then
+        result.unwrap();
+    }
+
     #[test]
     fn ensure_chain_is_available__should_succeed_when_chain_has_supporters() {
         // Given
@@ -459,35 +488,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn build_signature_request__should_reject_payload_not_matching_expected_hash() {
-        // Given
-        let request = verify_foreign_tx_request(Some(dtos::Hash256([1u8; 32])));
-        let payload = bitcoin_payload();
-
-        // When
-        let result = build_signature_request(&request, &payload);
-
-        // Then
-        let error = result.unwrap_err().to_string();
-        assert!(
-            error.contains("does not match the request's expected payload hash"),
-            "expected the payload hash mismatch error, got: {error}",
-        );
-    }
-
-    #[test]
-    fn build_signature_request__should_accept_any_payload_without_expected_hash() {
-        // Given
-        let request = verify_foreign_tx_request(None);
-
-        // When
-        let result = build_signature_request(&request, &bitcoin_payload());
-
-        // Then
-        result.unwrap();
-    }
-
     fn bitcoin_request() -> dtos::ForeignChainRpcRequest {
         dtos::ForeignChainRpcRequest::Bitcoin(dtos::BitcoinRpcRequest {
             tx_id: dtos::BitcoinTxId([0; 32]),
@@ -496,44 +496,6 @@ mod tests {
         })
     }
 
-    // fn bitcoin_chain_policy() -> dtos::SupportedForeignChains {
-    //     BTreeSet::from([dtos::ForeignChain::Bitcoin]).into()
-    // }
-
-    // fn mock_policy_reader(policy: dtos::SupportedForeignChains) -> MockReadSupportedForeignChain {
-    //     let mut reader = MockReadSupportedForeignChain::new();
-    //     reader
-    //         .expect_get_supported_chains()
-    //         .returning(move || Box::pin(std::future::ready(Ok(policy.clone()))));
-    //     reader
-    // }
-
-    // #[tokio::test]
-    // async fn chain_is_supported__should_succeed_when_chain_is_present_in_policy() {
-    //     let reader = mock_policy_reader(bitcoin_chain_policy());
-
-    //     assert_matches!(chain_is_supported(&reader, &bitcoin_request()).await, Ok(_));
-    // }
-
-    // #[test]
-    // fn ensure_chain_is_available__should_fail_when_chain_has_no_supporters() {
-    //     // Given: the supporters map covers Bitcoin, but the request is for Ethereum.
-    //     let supporters = bitcoin_supporters();
-    //     let ethereum_request = dtos::ForeignChainRpcRequest::Ethereum(dtos::EvmRpcRequest {
-    //         tx_id: dtos::EvmTxId([0; 32]),
-    //         extractors: vec![],
-    //         finality: dtos::EvmFinality::Finalized,
-    //     });
-
-    //     // When, then
-    //     assert_matches!(
-    //         ensure_chain_is_available(&supporters, &ethereum_request),
-    //         Err(ChainNotAvailableError {
-    //             requested: dtos::ForeignChain::Ethereum
-    //         })
-    //     );
-    // }
-
     fn bitcoin_payload() -> dtos::ForeignTxSignPayload {
         dtos::ForeignTxSignPayload::V1(dtos::ForeignTxSignPayloadV1 {
             request: bitcoin_request(),
@@ -557,24 +519,4 @@ mod tests {
             domain_id: mpc_primitives::domain::DomainId(0),
         }
     }
-
-    // fn bitcoin_request() -> dtos::ForeignChainRpcRequest {
-    //     dtos::ForeignChainRpcRequest::Bitcoin(dtos::BitcoinRpcRequest {
-    //         tx_id: dtos::BitcoinTxId([0; 32]),
-    //         confirmations: dtos::BlockConfirmations(6),
-    //         extractors: vec![dtos::BitcoinExtractor::BlockHash],
-    //     })
-    // }
-
-    // fn bitcoin_chain_policy() -> dtos::SupportedForeignChains {
-    //     BTreeSet::from([dtos::ForeignChain::Bitcoin]).into()
-    // }
-
-    // fn mock_policy_reader(policy: dtos::SupportedForeignChains) -> MockReadSupportedForeignChain {
-    //     let mut reader = MockReadSupportedForeignChain::new();
-    //     reader
-    //         .expect_get_supported_chains()
-    //         .returning(move || Box::pin(std::future::ready(Ok(policy.clone()))));
-    //     reader
-    // }
 }