fix merge conflicts

tari-project · Jan 17, 2025 · ae4463c · ae4463c
1 parent bbe15a8
commit ae4463c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/base_layer/wallet/tests/transaction_service_tests/service.rs b/base_layer/wallet/tests/transaction_service_tests/service.rs
@@ -6261,7 +6261,7 @@ async fn test_completed_transactions_ordering() {
             mined_height: None,
             mined_in_block: None,
             mined_timestamp: DateTime::<Utc>::from_timestamp(random_timestamp + 100i64, 0),
-            payment_id: PaymentId::open_from_str("Yo!"),
+            payment_id: PaymentId::open("Yo!", TxType::PaymentToOther),
         };
 
         tx_backend