From 50f296459f108fd6ac7554f266e8158304cf1f32 Mon Sep 17 00:00:00 2001 From: Mykhailo Kremniov Date: Tue, 1 Jul 2025 11:56:27 +0300 Subject: [PATCH 1/2] Refactor mintscript tests - put the expected output directly into the code --- Cargo.lock | 3 + mintscript/Cargo.toml | 3 + mintscript/src/tests/translate/mod.rs | 429 ++++++++++++++---- .../snap.translate.reward.acctspend_00.txt | 1 - .../snap.translate.reward.acctspend_01.txt | 1 - .../snap.translate.reward.acctspend_02.txt | 1 - .../snap.translate.reward.burn_00.txt | 1 - .../snap.translate.reward.burn_01.txt | 1 - ...snap.translate.reward.concludeorder_00.txt | 1 - ...snap.translate.reward.concludeorder_01.txt | 1 - ...snap.translate.reward.concludeorder_02.txt | 1 - ...snap.translate.reward.concludeorder_03.txt | 1 - .../snap.translate.reward.createorder_00.txt | 1 - .../snap.translate.reward.createorder_01.txt | 1 - .../snap.translate.reward.delegate_00.txt | 1 - .../snap.translate.reward.delegate_01.txt | 1 - .../snap.translate.reward.fillorder_00.txt | 1 - .../snap.translate.reward.fillorder_01.txt | 1 - .../snap.translate.reward.fillorder_02.txt | 1 - .../snap.translate.reward.htlc_00.txt | 1 - .../snap.translate.reward.htlc_01.txt | 1 - .../snap.translate.reward.htlc_02.txt | 1 - .../snap.translate.reward.htlc_03.txt | 1 - .../snap.translate.reward.htlc_04.txt | 1 - .../snap.translate.reward.mint_00.txt | 1 - .../snap.translate.reward.mint_01.txt | 1 - .../snap.translate.reward.mint_02.txt | 1 - .../snap.translate.reward.newpool_00.txt | 1 - .../snap.translate.reward.prodblock_00.txt | 1 - .../snap.translate.reward.prodblock_01.txt | 1 - .../snap.translate.reward.prodblock_02.txt | 1 - .../snap.translate.reward.prodblock_03.txt | 1 - .../snap.translate.reward.prodblock_04.txt | 1 - .../snap.translate.reward.transfer_00.txt | 1 - .../snap.translate.reward.transfer_01.txt | 1 - .../snap.translate.reward.transfer_02.txt | 1 - .../snap.translate.reward.transfer_03.txt | 1 - .../snap.translate.reward.transfertl_00.txt | 1 - .../snap.translate.reward.transfertl_01.txt | 1 - .../snap.translate.reward.transfertl_02.txt | 1 - .../snap.translate.reward.transfertl_03.txt | 1 - .../snap.translate.reward.transfertl_04.txt | 1 - .../snap.translate.sigonly.acctspend_00.txt | 1 - .../snap.translate.sigonly.acctspend_01.txt | 1 - .../snap.translate.sigonly.acctspend_02.txt | 1 - .../snap.translate.sigonly.burn_00.txt | 1 - .../snap.translate.sigonly.burn_01.txt | 1 - ...nap.translate.sigonly.concludeorder_00.txt | 1 - ...nap.translate.sigonly.concludeorder_01.txt | 1 - ...nap.translate.sigonly.concludeorder_02.txt | 1 - ...nap.translate.sigonly.concludeorder_03.txt | 1 - .../snap.translate.sigonly.createorder_00.txt | 1 - .../snap.translate.sigonly.createorder_01.txt | 1 - .../snap.translate.sigonly.delegate_00.txt | 1 - .../snap.translate.sigonly.delegate_01.txt | 1 - .../snap.translate.sigonly.fillorder_00.txt | 1 - .../snap.translate.sigonly.fillorder_01.txt | 1 - .../snap.translate.sigonly.fillorder_02.txt | 1 - .../snap.translate.sigonly.htlc_00.txt | 1 - .../snap.translate.sigonly.htlc_01.txt | 1 - .../snap.translate.sigonly.htlc_02.txt | 1 - .../snap.translate.sigonly.htlc_03.txt | 1 - .../snap.translate.sigonly.htlc_04.txt | 1 - .../snap.translate.sigonly.mint_00.txt | 1 - .../snap.translate.sigonly.mint_01.txt | 1 - .../snap.translate.sigonly.mint_02.txt | 1 - .../snap.translate.sigonly.newpool_00.txt | 1 - .../snap.translate.sigonly.prodblock_00.txt | 1 - .../snap.translate.sigonly.prodblock_01.txt | 1 - .../snap.translate.sigonly.prodblock_02.txt | 1 - .../snap.translate.sigonly.prodblock_03.txt | 1 - .../snap.translate.sigonly.prodblock_04.txt | 1 - .../snap.translate.sigonly.transfer_00.txt | 1 - .../snap.translate.sigonly.transfer_01.txt | 1 - .../snap.translate.sigonly.transfer_02.txt | 1 - .../snap.translate.sigonly.transfer_03.txt | 1 - .../snap.translate.sigonly.transfertl_00.txt | 1 - .../snap.translate.sigonly.transfertl_01.txt | 1 - .../snap.translate.sigonly.transfertl_02.txt | 1 - .../snap.translate.sigonly.transfertl_03.txt | 1 - .../snap.translate.sigonly.transfertl_04.txt | 1 - .../snap.translate.tlockonly.acctspend_00.txt | 1 - .../snap.translate.tlockonly.acctspend_01.txt | 1 - .../snap.translate.tlockonly.acctspend_02.txt | 1 - .../snap.translate.tlockonly.burn_00.txt | 1 - .../snap.translate.tlockonly.burn_01.txt | 1 - ...p.translate.tlockonly.concludeorder_00.txt | 1 - ...p.translate.tlockonly.concludeorder_01.txt | 1 - ...p.translate.tlockonly.concludeorder_02.txt | 1 - ...p.translate.tlockonly.concludeorder_03.txt | 1 - ...nap.translate.tlockonly.createorder_00.txt | 1 - ...nap.translate.tlockonly.createorder_01.txt | 1 - .../snap.translate.tlockonly.delegate_00.txt | 1 - .../snap.translate.tlockonly.delegate_01.txt | 1 - .../snap.translate.tlockonly.fillorder_00.txt | 1 - .../snap.translate.tlockonly.fillorder_01.txt | 1 - .../snap.translate.tlockonly.fillorder_02.txt | 1 - .../snap.translate.tlockonly.htlc_00.txt | 1 - .../snap.translate.tlockonly.htlc_01.txt | 1 - .../snap.translate.tlockonly.htlc_02.txt | 1 - .../snap.translate.tlockonly.htlc_03.txt | 1 - .../snap.translate.tlockonly.htlc_04.txt | 1 - .../snap.translate.tlockonly.mint_00.txt | 1 - .../snap.translate.tlockonly.mint_01.txt | 1 - .../snap.translate.tlockonly.mint_02.txt | 1 - .../snap.translate.tlockonly.newpool_00.txt | 1 - .../snap.translate.tlockonly.prodblock_00.txt | 1 - .../snap.translate.tlockonly.prodblock_01.txt | 1 - .../snap.translate.tlockonly.prodblock_02.txt | 1 - .../snap.translate.tlockonly.prodblock_03.txt | 1 - .../snap.translate.tlockonly.prodblock_04.txt | 1 - .../snap.translate.tlockonly.transfer_00.txt | 1 - .../snap.translate.tlockonly.transfer_01.txt | 1 - .../snap.translate.tlockonly.transfer_02.txt | 1 - .../snap.translate.tlockonly.transfer_03.txt | 1 - ...snap.translate.tlockonly.transfertl_00.txt | 1 - ...snap.translate.tlockonly.transfertl_01.txt | 1 - ...snap.translate.tlockonly.transfertl_02.txt | 1 - ...snap.translate.tlockonly.transfertl_03.txt | 1 - ...snap.translate.tlockonly.transfertl_04.txt | 1 - .../snap.translate.txn.acctspend_00.txt | 1 - .../snap.translate.txn.acctspend_01.txt | 1 - .../snap.translate.txn.acctspend_02.txt | 1 - .../translate/snap.translate.txn.burn_00.txt | 1 - .../translate/snap.translate.txn.burn_01.txt | 1 - .../snap.translate.txn.concludeorder_00.txt | 1 - .../snap.translate.txn.concludeorder_01.txt | 1 - .../snap.translate.txn.concludeorder_02.txt | 1 - .../snap.translate.txn.concludeorder_03.txt | 1 - .../snap.translate.txn.createorder_00.txt | 1 - .../snap.translate.txn.createorder_01.txt | 1 - .../snap.translate.txn.delegate_00.txt | 1 - .../snap.translate.txn.delegate_01.txt | 1 - .../snap.translate.txn.fillorder_00.txt | 1 - .../snap.translate.txn.fillorder_01.txt | 1 - .../snap.translate.txn.fillorder_02.txt | 1 - .../translate/snap.translate.txn.htlc_00.txt | 4 - .../translate/snap.translate.txn.htlc_01.txt | 4 - .../translate/snap.translate.txn.htlc_02.txt | 4 - .../translate/snap.translate.txn.htlc_03.txt | 4 - .../translate/snap.translate.txn.htlc_04.txt | 4 - .../translate/snap.translate.txn.mint_00.txt | 1 - .../translate/snap.translate.txn.mint_01.txt | 1 - .../translate/snap.translate.txn.mint_02.txt | 1 - .../snap.translate.txn.newpool_00.txt | 1 - .../snap.translate.txn.prodblock_00.txt | 1 - .../snap.translate.txn.prodblock_01.txt | 1 - .../snap.translate.txn.prodblock_02.txt | 1 - .../snap.translate.txn.prodblock_03.txt | 1 - .../snap.translate.txn.prodblock_04.txt | 1 - .../snap.translate.txn.transfer_00.txt | 1 - .../snap.translate.txn.transfer_01.txt | 1 - .../snap.translate.txn.transfer_02.txt | 1 - .../snap.translate.txn.transfer_03.txt | 1 - .../snap.translate.txn.transfertl_00.txt | 4 - .../snap.translate.txn.transfertl_01.txt | 4 - .../snap.translate.txn.transfertl_02.txt | 4 - .../snap.translate.txn.transfertl_03.txt | 4 - .../snap.translate.txn.transfertl_04.txt | 4 - utils/src/concatln.rs | 45 ++ utils/src/lib.rs | 1 + 161 files changed, 387 insertions(+), 280 deletions(-) delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.acctspend_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.acctspend_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.acctspend_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.burn_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.burn_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.concludeorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.concludeorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.concludeorder_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.concludeorder_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.createorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.createorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.delegate_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.delegate_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.fillorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.fillorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.fillorder_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.htlc_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.htlc_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.htlc_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.htlc_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.htlc_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.mint_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.mint_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.mint_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.newpool_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.prodblock_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.prodblock_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.prodblock_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.prodblock_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.prodblock_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfer_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfer_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfer_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfer_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfertl_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfertl_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfertl_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfertl_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.reward.transfertl_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.acctspend_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.acctspend_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.acctspend_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.burn_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.burn_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.createorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.createorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.delegate_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.delegate_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.fillorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.fillorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.fillorder_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.htlc_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.htlc_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.htlc_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.htlc_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.htlc_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.mint_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.mint_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.mint_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.newpool_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.prodblock_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.prodblock_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.prodblock_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.prodblock_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.prodblock_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfer_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfer_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfer_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfer_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfertl_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfertl_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfertl_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfertl_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.sigonly.transfertl_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.burn_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.burn_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.createorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.createorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.delegate_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.delegate_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.htlc_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.htlc_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.htlc_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.htlc_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.htlc_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.mint_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.mint_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.mint_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.newpool_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfer_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfer_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfer_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfer_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.acctspend_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.acctspend_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.acctspend_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.burn_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.burn_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.concludeorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.concludeorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.concludeorder_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.concludeorder_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.createorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.createorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.delegate_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.delegate_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.fillorder_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.fillorder_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.fillorder_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.htlc_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.htlc_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.htlc_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.htlc_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.htlc_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.mint_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.mint_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.mint_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.newpool_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.prodblock_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.prodblock_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.prodblock_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.prodblock_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.prodblock_04.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfer_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfer_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfer_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfer_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfertl_00.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfertl_01.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfertl_02.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfertl_03.txt delete mode 100644 mintscript/src/tests/translate/snap.translate.txn.transfertl_04.txt create mode 100644 utils/src/concatln.rs diff --git a/Cargo.lock b/Cargo.lock index 3e83ee851f..625e40e918 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4646,6 +4646,8 @@ version = "1.0.2" dependencies = [ "common", "crypto", + "ctor", + "derive_more", "expect-test", "hex", "logging", @@ -4654,6 +4656,7 @@ dependencies = [ "rstest", "serialization", "static_assertions", + "strum", "test-utils", "thiserror", "tokens-accounting", diff --git a/mintscript/Cargo.toml b/mintscript/Cargo.toml index a6064cb34a..b587cf44c4 100644 --- a/mintscript/Cargo.toml +++ b/mintscript/Cargo.toml @@ -18,7 +18,10 @@ tokens-accounting = { path = "../tokens-accounting" } utils = { path = "../utils" } utxo = { path = "../utxo" } +ctor.workspace = true +derive_more.workspace = true static_assertions.workspace = true +strum.workspace = true thiserror.workspace = true [dev-dependencies] diff --git a/mintscript/src/tests/translate/mod.rs b/mintscript/src/tests/translate/mod.rs index 98024da3d7..9a97b566b0 100644 --- a/mintscript/src/tests/translate/mod.rs +++ b/mintscript/src/tests/translate/mod.rs @@ -13,9 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -use self::mocks::MockSigInfoProvider; +use std::collections::BTreeMap; -use super::*; +use strum::IntoEnumIterator as _; + +use ::utils::concatln; use common::{ chain::{ block::BlockRewardTransactable, @@ -27,12 +29,22 @@ use common::{ primitives::per_thousand::PerThousand, }; use crypto::vrf::{VRFPrivateKey, VRFPublicKey}; +use logging::log; use pos_accounting::{DelegationData, PoolData}; use serialization::Encode; use tokens_accounting::TokenData; +use super::*; + +use self::mocks::MockSigInfoProvider; + mod mocks; +#[ctor::ctor] +fn init() { + logging::init_logging(); +} + // Like input info but owned enum TestInputInfo { Utxo { @@ -259,131 +271,360 @@ fn fill_order(id: OrderId) -> TestInputInfo { TestInputInfo::AccountCommand { command } } -// A hack to specify all the modes in the parametrized test below. The mode specification ought to -// be simplified in the actual implementation and then this may be dropped. - -trait TranslationMode<'b> { - const NAME: &'static str; - type Mode: for<'a> TranslateInput> + 'b; - fn translate_input_and_witness( - &self, - info: &mocks::MockSigInfoProvider, - ) -> Result { - Self::Mode::translate_input(info) - } -} - -struct TxnMode; -impl TranslationMode<'_> for TxnMode { - const NAME: &'static str = "txn"; - type Mode = SignedTransaction; -} - -struct RewardMode; -impl<'a> TranslationMode<'a> for RewardMode { - const NAME: &'static str = "reward"; - type Mode = BlockRewardTransactable<'a>; -} - -impl TranslationMode<'_> for TimelockOnly { - const NAME: &'static str = "tlockonly"; - type Mode = Self; -} - -impl TranslationMode<'_> for SignatureOnlyTx { - const NAME: &'static str = "sigonly"; - type Mode = Self; -} - -fn mode_name<'a, T: TranslationMode<'a>>(_: &T) -> &'static str { - T::NAME +#[derive( + Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug, strum::EnumIter, derive_more::Display, +)] +enum Mode { + Reward, + TxSigOnly, + TxTimelockOnly, + TxFull, } // The test itself +// TODO: it's better to refactor this test further and: +// * split the single test into multiple ones; +// * compare the original Rust objects instead of their string representations. #[rstest::rstest] -#[case("burn_00", burn(100_000), nosig())] -#[case("burn_01", burn(200_000), stdsig(0x51))] -#[case("transfer_00", transfer_pk(12, 555), nosig())] -#[case("transfer_01", transfer_pk(13, 557), stdsig(0x51))] -#[case("transfer_02", transfer_pkh(0x12, 300_000), stdsig(0x52))] -#[case("transfer_03", transfer_pkh(0x12, 300_000), nosig())] +#[case(burn(100_000), nosig(), &[ + (Mode::Reward, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxSigOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxTimelockOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxFull, "ERROR: Attempt to spend an unspendable output"), +])] +#[case(burn(200_000), stdsig(0x51), &[ + (Mode::Reward, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxSigOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxTimelockOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxFull, "ERROR: Attempt to spend an unspendable output"), +])] +#[case(transfer_pk(12, 555), nosig(), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x020003e843fa18427b5e71eb6b94eaffcbf52ddc8dc6e843d259f31d7d5566ddc1b6c2, 0x0000)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x020003e843fa18427b5e71eb6b94eaffcbf52ddc8dc6e843d259f31d7d5566ddc1b6c2, 0x0000)"), +])] +#[case(transfer_pk(13, 557), stdsig(0x51), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085151)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085151)"), +])] +#[case(transfer_pkh(0x12, 300_000), stdsig(0x52), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x011212121212121212121212121212121212121212, 0x0101085252)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x011212121212121212121212121212121212121212, 0x0101085252)"), +])] +#[case(transfer_pkh(0x12, 300_000), nosig(), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x011212121212121212121212121212121212121212, 0x0000)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x011212121212121212121212121212121212121212, 0x0000)"), +])] #[case( - "transfertl_00", transfer_pk_tl(12, 555, tl_for_blocks(600)), - stdsig(0x5d) + stdsig(0x5d), + &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x020003e843fa18427b5e71eb6b94eaffcbf52ddc8dc6e843d259f31d7d5566ddc1b6c2, 0x0101085d5d)"), + (Mode::TxTimelockOnly, "after_blocks(600)"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " after_blocks(600),", + " signature(0x020003e843fa18427b5e71eb6b94eaffcbf52ddc8dc6e843d259f31d7d5566ddc1b6c2, 0x0101085d5d),", + "])" + )), + ] )] #[case( - "transfertl_01", transfer_pk_tl(13, 557, tl_until_height(155_554)), - stdsig(0x59) + stdsig(0x59), + &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085959)"), + (Mode::TxTimelockOnly, "until_height(155554)"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " until_height(155554),", + " signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085959),", + "])" + )), + ] )] #[case( - "transfertl_02", transfer_pk_tl(14, 558, tl_for_secs(365 * 24 * 60 * 60)), stdsig(0x5a), + &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x02000253f0022f209dfa5c224294e4aaf337dc062ec9f689fcc04b4f2196a71fad3758, 0x0101085a5a)"), + (Mode::TxTimelockOnly, "after_seconds(31536000)"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " after_seconds(31536000),", + " signature(0x02000253f0022f209dfa5c224294e4aaf337dc062ec9f689fcc04b4f2196a71fad3758, 0x0101085a5a),", + "])" + )), + ] )] #[case( - "transfertl_03", transfer_pk_tl(15, 559, tl_until_time(1_718_120_714)), - stdsig(0x5b) + stdsig(0x5b), + &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085b5b)"), + (Mode::TxTimelockOnly, "until_time(1718120714)"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " until_time(1718120714),", + " signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085b5b),", + "])" + )), + ] )] #[case( - "transfertl_04", transfer_pk_tl(16, 560, tl_until_height(999_999)), - nosig() + nosig(), + &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x020002ebcadc73233ea7fc2c8e2e5bcafc7dd4b46444a60d9b5bc9a965d2c6d8a44ebb, 0x0000)"), + (Mode::TxTimelockOnly, "until_height(999999)"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " until_height(999999),", + " signature(0x020002ebcadc73233ea7fc2c8e2e5bcafc7dd4b46444a60d9b5bc9a965d2c6d8a44ebb, 0x0000),", + "])" + )), + ] )] #[case( - "prodblock_00", prod_block(dest_pk(0x543), fake_id(0xe0)), - stdsig(0x60) + stdsig(0x60), + &[ + (Mode::Reward, "signature(0x0200032318d5bcf9bd716cad704d6052b9ea8419b7f691be78be7e76d393a4ed86448a, 0x0101086060)"), + (Mode::TxSigOnly, "ERROR: Stake pool e0e0…e0e0 does not exist"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "ERROR: Stake pool e0e0…e0e0 does not exist"), + ] )] -#[case("prodblock_01", prod_block(dest_pk(0x544), fake_id(0xe1)), nosig())] -#[case("prodblock_02", prod_block(pool0_decom(), fake_id(0xe2)), stdsig(0x63))] -#[case("prodblock_03", prod_block(dest_pk(0x545), pool0().0), stdsig(0x64))] -#[case("prodblock_04", prod_block(pool0_decom(), pool0().0), stdsig(0x65))] -#[case("delegate_00", delegate(5_000_000, 0xe2), stdsig(0x61))] -#[case("delegate_01", delegate(6_000_000, 0xe3), nosig())] -#[case("newpool_00", create_pool(14, 15), stdsig(0x53))] -#[case("acctspend_00", account_spend(deleg0().0, 579), stdsig(0x54))] -#[case("acctspend_01", account_spend(fake_id(0xf5), 580), stdsig(0x55))] -#[case("acctspend_02", account_spend(deleg0().0, 581), nosig())] -#[case("mint_00", mint(fake_id(0xa1), 581), stdsig(0x56))] -#[case("mint_01", mint(token0().0, 582), stdsig(0x57))] -#[case("mint_02", mint(token0().0, 582), nosig())] -#[case("htlc_00", htlc(11, 12, tl_until_height(999_999)), htlc_stdsig(0x54))] -#[case("htlc_01", htlc(13, 14, tl_for_secs(1111)), htlc_stdsig(0x58))] -#[case("htlc_02", htlc(15, 16, tl_until_time(99)), htlc_stdsig(0x53))] -#[case("htlc_03", htlc(17, 18, tl_for_secs(124)), htlc_multisig(0x54))] -#[case("htlc_04", htlc(19, 20, tl_for_blocks(1000)), htlc_multisig(0x55))] -#[case("createorder_00", create_order(order0().1), nosig())] -#[case("createorder_01", create_order(order0().1), stdsig(0x57))] -#[case("concludeorder_00", conclude_order(order0().0), nosig())] -#[case("concludeorder_01", conclude_order(fake_id(0x88)), nosig())] -#[case("concludeorder_02", conclude_order(order0().0), stdsig(0x44))] -#[case("concludeorder_03", conclude_order(order0().0), stdsig(0x45))] -#[case("fillorder_00", fill_order(order0().0), nosig())] -#[case("fillorder_01", fill_order(fake_id(0x77)), nosig())] -#[case("fillorder_00", fill_order(order0().0), stdsig(0x45))] +#[case(prod_block(dest_pk(0x544), fake_id(0xe1)), nosig(), &[ + (Mode::Reward, "signature(0x0200034696310c540f0a749bc023003c3c698dcc61bbb75a4b37f429f250eb8b7554b1, 0x0000)"), + (Mode::TxSigOnly, "ERROR: Stake pool e1e1…e1e1 does not exist"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "ERROR: Stake pool e1e1…e1e1 does not exist"), +])] +#[case(prod_block(pool0_decom(), fake_id(0xe2)), stdsig(0x63), &[ + (Mode::Reward, "signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086363)"), + (Mode::TxSigOnly, "ERROR: Stake pool e2e2…e2e2 does not exist"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "ERROR: Stake pool e2e2…e2e2 does not exist"), +])] +#[case(prod_block(dest_pk(0x545), pool0().0), stdsig(0x64), &[ + (Mode::Reward, "signature(0x020002e7759586e15d0e2b961f097a714515c4e145f4963f24ce99063f3ec9d0211e7a, 0x0101086464)"), + (Mode::TxSigOnly, "signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086464)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086464)"), +])] +#[case(prod_block(pool0_decom(), pool0().0), stdsig(0x65), &[ + (Mode::Reward, "signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086565)"), + (Mode::TxSigOnly, "signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086565)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086565)"), +])] +#[case(delegate(5_000_000, 0xe2), stdsig(0x61), &[ + (Mode::Reward, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxSigOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxTimelockOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxFull, "ERROR: Attempt to spend an unspendable output"), +])] +#[case(delegate(6_000_000, 0xe3), nosig(), &[ + (Mode::Reward, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxSigOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxTimelockOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxFull, "ERROR: Attempt to spend an unspendable output"), +])] +#[case(create_pool(14, 15), stdsig(0x53), &[ + (Mode::Reward, "signature(0x02000253f0022f209dfa5c224294e4aaf337dc062ec9f689fcc04b4f2196a71fad3758, 0x0101085353)"), + (Mode::TxSigOnly, "signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085353)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085353)"), +])] +#[case(account_spend(deleg0().0, 579), stdsig(0x54), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "signature(0x020002819f7f36a2790938e5f45ac07053110b8e985fbf7cff8a60a403e95b2a2c24fc, 0x0101085454)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x020002819f7f36a2790938e5f45ac07053110b8e985fbf7cff8a60a403e95b2a2c24fc, 0x0101085454)"), +])] +#[case(account_spend(fake_id(0xf5), 580), stdsig(0x55), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "ERROR: Delegation f5f5…f5f5 does not exist"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "ERROR: Delegation f5f5…f5f5 does not exist"), +])] +#[case(account_spend(deleg0().0, 581), nosig(), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "signature(0x020002819f7f36a2790938e5f45ac07053110b8e985fbf7cff8a60a403e95b2a2c24fc, 0x0000)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x020002819f7f36a2790938e5f45ac07053110b8e985fbf7cff8a60a403e95b2a2c24fc, 0x0000)"), +])] +#[case(mint(fake_id(0xa1), 581), stdsig(0x56), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "ERROR: Token with id a1a1…a1a1 does not exist"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "ERROR: Token with id a1a1…a1a1 does not exist"), +])] +#[case(mint(token0().0, 582), stdsig(0x57), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "signature(0x020003745607a08b12634e402eec525ddaaaaab73cc3951cd232cb88ad934f4be717f6, 0x0101085757)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x020003745607a08b12634e402eec525ddaaaaab73cc3951cd232cb88ad934f4be717f6, 0x0101085757)"), +])] +#[case(mint(token0().0, 582), nosig(), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "signature(0x020003745607a08b12634e402eec525ddaaaaab73cc3951cd232cb88ad934f4be717f6, 0x0000)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x020003745607a08b12634e402eec525ddaaaaab73cc3951cd232cb88ad934f4be717f6, 0x0000)"), +])] +#[case(htlc(11, 12, tl_until_height(999_999)), htlc_stdsig(0x54), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x020003574c6b846c9a4c555ea75d771d5a40564b9ef37419682da12573e1d8ac27d71e, 0x0101085454)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " Hash160(0x50000000000000000000000000000000000000000d, 0x0606060606060606060606060606060606060606060606060606060606060606),", + " signature(0x020003574c6b846c9a4c555ea75d771d5a40564b9ef37419682da12573e1d8ac27d71e, 0x0101085454),", + "])" + )), +])] +#[case(htlc(13, 14, tl_for_secs(1111)), htlc_stdsig(0x58), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085858)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " Hash160(0x50000000000000000000000000000000000000000d, 0x0606060606060606060606060606060606060606060606060606060606060606),", + " signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085858),", + "])" + )), +])] +#[case(htlc(15, 16, tl_until_time(99)), htlc_stdsig(0x53), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085353)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " Hash160(0x50000000000000000000000000000000000000000d, 0x0606060606060606060606060606060606060606060606060606060606060606),", + " signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085353),", + "])" + )), +])] +#[case(htlc(17, 18, tl_for_secs(124)), htlc_multisig(0x54), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x041c9bb73a209c49363022813e7197ac80c761d80b, 0x0101085454)"), + (Mode::TxTimelockOnly, "after_seconds(124)"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " after_seconds(124),", + " signature(0x041c9bb73a209c49363022813e7197ac80c761d80b, 0x0101085454),", + "])" + )), +])] +#[case(htlc(19, 20, tl_for_blocks(1000)), htlc_multisig(0x55), &[ + (Mode::Reward, "ERROR: Illegal output spend"), + (Mode::TxSigOnly, "signature(0x04d55789fd7dd4b58f8bdb889a0d31cac70e67df92, 0x0101085555)"), + (Mode::TxTimelockOnly, "after_blocks(1000)"), + (Mode::TxFull, concatln!( + "threshold(2, [", + " after_blocks(1000),", + " signature(0x04d55789fd7dd4b58f8bdb889a0d31cac70e67df92, 0x0101085555),", + "])" + )), +])] +#[case(create_order(order0().1), nosig(), &[ + (Mode::Reward, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxSigOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxTimelockOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxFull, "ERROR: Attempt to spend an unspendable output"), +])] +#[case(create_order(order0().1), stdsig(0x57), &[ + (Mode::Reward, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxSigOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxTimelockOnly, "ERROR: Attempt to spend an unspendable output"), + (Mode::TxFull, "ERROR: Attempt to spend an unspendable output"), +])] +#[case(conclude_order(order0().0), nosig(), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0000)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0000)"), +])] +#[case(conclude_order(fake_id(0x88)), nosig(), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "ERROR: Order with id 8888…8888 does not exist"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "ERROR: Order with id 8888…8888 does not exist"), +])] +#[case(conclude_order(order0().0), stdsig(0x44), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0101084444)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0101084444)"), +])] +#[case(conclude_order(order0().0), stdsig(0x45), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0101084545)"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0101084545)"), +])] +#[case(fill_order(order0().0), nosig(), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "true"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "true"), +])] +#[case(fill_order(fake_id(0x77)), nosig(), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "true"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "true"), +])] +#[case(fill_order(order0().0), stdsig(0x45), &[ + (Mode::Reward, "ERROR: Illegal account spend"), + (Mode::TxSigOnly, "true"), + (Mode::TxTimelockOnly, "true"), + (Mode::TxFull, "true"), +])] fn translate_snap( - #[values(TxnMode, RewardMode, TimelockOnly, SignatureOnlyTx)] mode: impl for<'a> TranslationMode<'a>, - #[case] name: &str, #[case] test_input_info: TestInputInfo, #[case] witness: InputWitness, + #[case] expected_results: &[(Mode, &str)], ) { let input_info = test_input_info.to_input_info(); let tokens = [token0()]; let delegs = [deleg0()]; let pools = [pool0()]; let orders = [order0()]; - let sig_info = - mocks::MockSigInfoProvider::new(input_info, witness, tokens, pools, delegs, orders); - let mode_str = mode_name(&mode); + let sig_info = MockSigInfoProvider::new(input_info, witness, tokens, pools, delegs, orders); + let expected_results = expected_results.iter().copied().collect::>(); - let result = match mode.translate_input_and_witness(&sig_info) { - Ok(script) => format!("{script}\n"), - Err(err) => format!("ERROR: {err}"), - }; + for mode in Mode::iter() { + log::debug!("Checking mode {mode}"); + + let result = match mode { + Mode::Reward => BlockRewardTransactable::<'_>::translate_input(&sig_info), + Mode::TxFull => SignedTransaction::translate_input(&sig_info), + Mode::TxTimelockOnly => TimelockOnly::translate_input(&sig_info), + Mode::TxSigOnly => SignatureOnlyTx::translate_input(&sig_info), + }; - expect_test::expect_file![format!("snap.translate.{mode_str}.{name}.txt")].assert_eq(&result); + let expected_result = *expected_results.get(&mode).unwrap(); + + let result_str = match result { + Ok(script) => format!("{script}"), + Err(err) => format!("ERROR: {err}"), + }; + + assert_eq!(result_str, expected_result); + } } diff --git a/mintscript/src/tests/translate/snap.translate.reward.acctspend_00.txt b/mintscript/src/tests/translate/snap.translate.reward.acctspend_00.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.acctspend_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.acctspend_01.txt b/mintscript/src/tests/translate/snap.translate.reward.acctspend_01.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.acctspend_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.acctspend_02.txt b/mintscript/src/tests/translate/snap.translate.reward.acctspend_02.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.acctspend_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.burn_00.txt b/mintscript/src/tests/translate/snap.translate.reward.burn_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.burn_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.burn_01.txt b/mintscript/src/tests/translate/snap.translate.reward.burn_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.burn_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.concludeorder_00.txt b/mintscript/src/tests/translate/snap.translate.reward.concludeorder_00.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.concludeorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.concludeorder_01.txt b/mintscript/src/tests/translate/snap.translate.reward.concludeorder_01.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.concludeorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.concludeorder_02.txt b/mintscript/src/tests/translate/snap.translate.reward.concludeorder_02.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.concludeorder_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.concludeorder_03.txt b/mintscript/src/tests/translate/snap.translate.reward.concludeorder_03.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.concludeorder_03.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.createorder_00.txt b/mintscript/src/tests/translate/snap.translate.reward.createorder_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.createorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.createorder_01.txt b/mintscript/src/tests/translate/snap.translate.reward.createorder_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.createorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.delegate_00.txt b/mintscript/src/tests/translate/snap.translate.reward.delegate_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.delegate_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.delegate_01.txt b/mintscript/src/tests/translate/snap.translate.reward.delegate_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.delegate_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.fillorder_00.txt b/mintscript/src/tests/translate/snap.translate.reward.fillorder_00.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.fillorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.fillorder_01.txt b/mintscript/src/tests/translate/snap.translate.reward.fillorder_01.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.fillorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.fillorder_02.txt b/mintscript/src/tests/translate/snap.translate.reward.fillorder_02.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.fillorder_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.htlc_00.txt b/mintscript/src/tests/translate/snap.translate.reward.htlc_00.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.htlc_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.htlc_01.txt b/mintscript/src/tests/translate/snap.translate.reward.htlc_01.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.htlc_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.htlc_02.txt b/mintscript/src/tests/translate/snap.translate.reward.htlc_02.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.htlc_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.htlc_03.txt b/mintscript/src/tests/translate/snap.translate.reward.htlc_03.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.htlc_03.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.htlc_04.txt b/mintscript/src/tests/translate/snap.translate.reward.htlc_04.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.htlc_04.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.mint_00.txt b/mintscript/src/tests/translate/snap.translate.reward.mint_00.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.mint_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.mint_01.txt b/mintscript/src/tests/translate/snap.translate.reward.mint_01.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.mint_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.mint_02.txt b/mintscript/src/tests/translate/snap.translate.reward.mint_02.txt deleted file mode 100644 index d6ff8f8ae1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.mint_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal account spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.newpool_00.txt b/mintscript/src/tests/translate/snap.translate.reward.newpool_00.txt deleted file mode 100644 index 43d5f1a2c4..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.newpool_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x02000253f0022f209dfa5c224294e4aaf337dc062ec9f689fcc04b4f2196a71fad3758, 0x0101085353) diff --git a/mintscript/src/tests/translate/snap.translate.reward.prodblock_00.txt b/mintscript/src/tests/translate/snap.translate.reward.prodblock_00.txt deleted file mode 100644 index 01411f17aa..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.prodblock_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200032318d5bcf9bd716cad704d6052b9ea8419b7f691be78be7e76d393a4ed86448a, 0x0101086060) diff --git a/mintscript/src/tests/translate/snap.translate.reward.prodblock_01.txt b/mintscript/src/tests/translate/snap.translate.reward.prodblock_01.txt deleted file mode 100644 index 8264faa5cf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.prodblock_01.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200034696310c540f0a749bc023003c3c698dcc61bbb75a4b37f429f250eb8b7554b1, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.reward.prodblock_02.txt b/mintscript/src/tests/translate/snap.translate.reward.prodblock_02.txt deleted file mode 100644 index 54153cd7b0..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.prodblock_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086363) diff --git a/mintscript/src/tests/translate/snap.translate.reward.prodblock_03.txt b/mintscript/src/tests/translate/snap.translate.reward.prodblock_03.txt deleted file mode 100644 index 7574fa5dab..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.prodblock_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002e7759586e15d0e2b961f097a714515c4e145f4963f24ce99063f3ec9d0211e7a, 0x0101086464) diff --git a/mintscript/src/tests/translate/snap.translate.reward.prodblock_04.txt b/mintscript/src/tests/translate/snap.translate.reward.prodblock_04.txt deleted file mode 100644 index 4d81c84ae8..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.prodblock_04.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086565) diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfer_00.txt b/mintscript/src/tests/translate/snap.translate.reward.transfer_00.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfer_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfer_01.txt b/mintscript/src/tests/translate/snap.translate.reward.transfer_01.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfer_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfer_02.txt b/mintscript/src/tests/translate/snap.translate.reward.transfer_02.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfer_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfer_03.txt b/mintscript/src/tests/translate/snap.translate.reward.transfer_03.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfer_03.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfertl_00.txt b/mintscript/src/tests/translate/snap.translate.reward.transfertl_00.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfertl_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfertl_01.txt b/mintscript/src/tests/translate/snap.translate.reward.transfertl_01.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfertl_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfertl_02.txt b/mintscript/src/tests/translate/snap.translate.reward.transfertl_02.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfertl_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfertl_03.txt b/mintscript/src/tests/translate/snap.translate.reward.transfertl_03.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfertl_03.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.reward.transfertl_04.txt b/mintscript/src/tests/translate/snap.translate.reward.transfertl_04.txt deleted file mode 100644 index 391e4beff7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.reward.transfertl_04.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Illegal output spend \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_00.txt deleted file mode 100644 index 58cba20280..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002819f7f36a2790938e5f45ac07053110b8e985fbf7cff8a60a403e95b2a2c24fc, 0x0101085454) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_01.txt deleted file mode 100644 index 3177f51198..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Delegation f5f5…f5f5 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_02.txt b/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_02.txt deleted file mode 100644 index 582e6d4d7b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.acctspend_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002819f7f36a2790938e5f45ac07053110b8e985fbf7cff8a60a403e95b2a2c24fc, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.burn_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.burn_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.burn_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.burn_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.burn_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.burn_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_00.txt deleted file mode 100644 index ecd4b9ce80..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_01.txt deleted file mode 100644 index 44099c2e1b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Order with id 8888…8888 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_02.txt b/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_02.txt deleted file mode 100644 index ef0b468b80..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0101084444) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_03.txt b/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_03.txt deleted file mode 100644 index 976babc21a..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.concludeorder_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0101084545) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.createorder_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.createorder_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.createorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.createorder_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.createorder_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.createorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.delegate_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.delegate_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.delegate_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.delegate_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.delegate_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.delegate_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_02.txt b/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.fillorder_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.htlc_00.txt deleted file mode 100644 index 1c10b0cdc0..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020003574c6b846c9a4c555ea75d771d5a40564b9ef37419682da12573e1d8ac27d71e, 0x0101085454) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.htlc_01.txt deleted file mode 100644 index eedc64c997..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_01.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085858) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_02.txt b/mintscript/src/tests/translate/snap.translate.sigonly.htlc_02.txt deleted file mode 100644 index 6cb31ca1bf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085353) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_03.txt b/mintscript/src/tests/translate/snap.translate.sigonly.htlc_03.txt deleted file mode 100644 index 28143e8292..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x041c9bb73a209c49363022813e7197ac80c761d80b, 0x0101085454) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_04.txt b/mintscript/src/tests/translate/snap.translate.sigonly.htlc_04.txt deleted file mode 100644 index 73a76ec766..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.htlc_04.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x04d55789fd7dd4b58f8bdb889a0d31cac70e67df92, 0x0101085555) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.mint_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.mint_00.txt deleted file mode 100644 index 8c13683b9a..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.mint_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Token with id a1a1…a1a1 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.mint_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.mint_01.txt deleted file mode 100644 index a9637cc964..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.mint_01.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020003745607a08b12634e402eec525ddaaaaab73cc3951cd232cb88ad934f4be717f6, 0x0101085757) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.mint_02.txt b/mintscript/src/tests/translate/snap.translate.sigonly.mint_02.txt deleted file mode 100644 index 7d85876d3d..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.mint_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020003745607a08b12634e402eec525ddaaaaab73cc3951cd232cb88ad934f4be717f6, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.newpool_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.newpool_00.txt deleted file mode 100644 index 6cb31ca1bf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.newpool_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085353) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_00.txt deleted file mode 100644 index c93e6dc95e..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Stake pool e0e0…e0e0 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_01.txt deleted file mode 100644 index 5162fe2be0..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Stake pool e1e1…e1e1 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_02.txt b/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_02.txt deleted file mode 100644 index 3362bb16d2..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Stake pool e2e2…e2e2 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_03.txt b/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_03.txt deleted file mode 100644 index 772e72bd26..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086464) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_04.txt b/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_04.txt deleted file mode 100644 index 4d81c84ae8..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.prodblock_04.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086565) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfer_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfer_00.txt deleted file mode 100644 index 1b2f3ec6e7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfer_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020003e843fa18427b5e71eb6b94eaffcbf52ddc8dc6e843d259f31d7d5566ddc1b6c2, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfer_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfer_01.txt deleted file mode 100644 index 0cd13f2ebd..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfer_01.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085151) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfer_02.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfer_02.txt deleted file mode 100644 index 3d29c7fbb9..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfer_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x011212121212121212121212121212121212121212, 0x0101085252) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfer_03.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfer_03.txt deleted file mode 100644 index 48791373a0..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfer_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x011212121212121212121212121212121212121212, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_00.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_00.txt deleted file mode 100644 index b62b47af04..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020003e843fa18427b5e71eb6b94eaffcbf52ddc8dc6e843d259f31d7d5566ddc1b6c2, 0x0101085d5d) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_01.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_01.txt deleted file mode 100644 index 999853ba87..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_01.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085959) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_02.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_02.txt deleted file mode 100644 index 2f32a22553..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x02000253f0022f209dfa5c224294e4aaf337dc062ec9f689fcc04b4f2196a71fad3758, 0x0101085a5a) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_03.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_03.txt deleted file mode 100644 index c6074c8c17..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085b5b) diff --git a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_04.txt b/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_04.txt deleted file mode 100644 index 9705bf0078..0000000000 --- a/mintscript/src/tests/translate/snap.translate.sigonly.transfertl_04.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002ebcadc73233ea7fc2c8e2e5bcafc7dd4b46444a60d9b5bc9a965d2c6d8a44ebb, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_02.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.acctspend_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.burn_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.burn_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.burn_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.burn_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.burn_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.burn_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_02.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_03.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_03.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.concludeorder_03.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.createorder_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.createorder_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.createorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.createorder_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.createorder_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.createorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.delegate_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.delegate_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.delegate_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.delegate_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.delegate_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.delegate_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_02.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.fillorder_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_02.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_03.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_03.txt deleted file mode 100644 index 545cbcaa83..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_03.txt +++ /dev/null @@ -1 +0,0 @@ -after_seconds(124) diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_04.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_04.txt deleted file mode 100644 index e433ae61a8..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.htlc_04.txt +++ /dev/null @@ -1 +0,0 @@ -after_blocks(1000) diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.mint_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.mint_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.mint_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.mint_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.mint_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.mint_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.mint_02.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.mint_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.mint_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.newpool_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.newpool_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.newpool_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_02.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_03.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_03.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_03.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_04.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_04.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.prodblock_04.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_02.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_03.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_03.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfer_03.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_00.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_00.txt deleted file mode 100644 index 8b0ded4b8f..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_00.txt +++ /dev/null @@ -1 +0,0 @@ -after_blocks(600) diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_01.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_01.txt deleted file mode 100644 index 03e874079e..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_01.txt +++ /dev/null @@ -1 +0,0 @@ -until_height(155554) diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_02.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_02.txt deleted file mode 100644 index 696c837ac1..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_02.txt +++ /dev/null @@ -1 +0,0 @@ -after_seconds(31536000) diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_03.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_03.txt deleted file mode 100644 index d17c7ef786..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_03.txt +++ /dev/null @@ -1 +0,0 @@ -until_time(1718120714) diff --git a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_04.txt b/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_04.txt deleted file mode 100644 index d5234bbc24..0000000000 --- a/mintscript/src/tests/translate/snap.translate.tlockonly.transfertl_04.txt +++ /dev/null @@ -1 +0,0 @@ -until_height(999999) diff --git a/mintscript/src/tests/translate/snap.translate.txn.acctspend_00.txt b/mintscript/src/tests/translate/snap.translate.txn.acctspend_00.txt deleted file mode 100644 index 58cba20280..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.acctspend_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002819f7f36a2790938e5f45ac07053110b8e985fbf7cff8a60a403e95b2a2c24fc, 0x0101085454) diff --git a/mintscript/src/tests/translate/snap.translate.txn.acctspend_01.txt b/mintscript/src/tests/translate/snap.translate.txn.acctspend_01.txt deleted file mode 100644 index 3177f51198..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.acctspend_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Delegation f5f5…f5f5 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.acctspend_02.txt b/mintscript/src/tests/translate/snap.translate.txn.acctspend_02.txt deleted file mode 100644 index 582e6d4d7b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.acctspend_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002819f7f36a2790938e5f45ac07053110b8e985fbf7cff8a60a403e95b2a2c24fc, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.txn.burn_00.txt b/mintscript/src/tests/translate/snap.translate.txn.burn_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.burn_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.burn_01.txt b/mintscript/src/tests/translate/snap.translate.txn.burn_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.burn_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.concludeorder_00.txt b/mintscript/src/tests/translate/snap.translate.txn.concludeorder_00.txt deleted file mode 100644 index ecd4b9ce80..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.concludeorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.txn.concludeorder_01.txt b/mintscript/src/tests/translate/snap.translate.txn.concludeorder_01.txt deleted file mode 100644 index 44099c2e1b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.concludeorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Order with id 8888…8888 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.concludeorder_02.txt b/mintscript/src/tests/translate/snap.translate.txn.concludeorder_02.txt deleted file mode 100644 index ef0b468b80..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.concludeorder_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0101084444) diff --git a/mintscript/src/tests/translate/snap.translate.txn.concludeorder_03.txt b/mintscript/src/tests/translate/snap.translate.txn.concludeorder_03.txt deleted file mode 100644 index 976babc21a..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.concludeorder_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x02000236d8c927b785e27385737e82cdde2e06dc510ab8545d6eab0ca05c36040a437c, 0x0101084545) diff --git a/mintscript/src/tests/translate/snap.translate.txn.createorder_00.txt b/mintscript/src/tests/translate/snap.translate.txn.createorder_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.createorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.createorder_01.txt b/mintscript/src/tests/translate/snap.translate.txn.createorder_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.createorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.delegate_00.txt b/mintscript/src/tests/translate/snap.translate.txn.delegate_00.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.delegate_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.delegate_01.txt b/mintscript/src/tests/translate/snap.translate.txn.delegate_01.txt deleted file mode 100644 index 776077671b..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.delegate_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Attempt to spend an unspendable output \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.fillorder_00.txt b/mintscript/src/tests/translate/snap.translate.txn.fillorder_00.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.fillorder_00.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.txn.fillorder_01.txt b/mintscript/src/tests/translate/snap.translate.txn.fillorder_01.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.fillorder_01.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.txn.fillorder_02.txt b/mintscript/src/tests/translate/snap.translate.txn.fillorder_02.txt deleted file mode 100644 index 27ba77ddaf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.fillorder_02.txt +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/mintscript/src/tests/translate/snap.translate.txn.htlc_00.txt b/mintscript/src/tests/translate/snap.translate.txn.htlc_00.txt deleted file mode 100644 index db9b3f90ab..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.htlc_00.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - Hash160(0x50000000000000000000000000000000000000000d, 0x0606060606060606060606060606060606060606060606060606060606060606), - signature(0x020003574c6b846c9a4c555ea75d771d5a40564b9ef37419682da12573e1d8ac27d71e, 0x0101085454), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.htlc_01.txt b/mintscript/src/tests/translate/snap.translate.txn.htlc_01.txt deleted file mode 100644 index 3cdde3a8dc..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.htlc_01.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - Hash160(0x50000000000000000000000000000000000000000d, 0x0606060606060606060606060606060606060606060606060606060606060606), - signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085858), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.htlc_02.txt b/mintscript/src/tests/translate/snap.translate.txn.htlc_02.txt deleted file mode 100644 index a5b9c54abf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.htlc_02.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - Hash160(0x50000000000000000000000000000000000000000d, 0x0606060606060606060606060606060606060606060606060606060606060606), - signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085353), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.htlc_03.txt b/mintscript/src/tests/translate/snap.translate.txn.htlc_03.txt deleted file mode 100644 index c2c25f6747..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.htlc_03.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - after_seconds(124), - signature(0x041c9bb73a209c49363022813e7197ac80c761d80b, 0x0101085454), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.htlc_04.txt b/mintscript/src/tests/translate/snap.translate.txn.htlc_04.txt deleted file mode 100644 index ee97600eb8..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.htlc_04.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - after_blocks(1000), - signature(0x04d55789fd7dd4b58f8bdb889a0d31cac70e67df92, 0x0101085555), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.mint_00.txt b/mintscript/src/tests/translate/snap.translate.txn.mint_00.txt deleted file mode 100644 index 8c13683b9a..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.mint_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Token with id a1a1…a1a1 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.mint_01.txt b/mintscript/src/tests/translate/snap.translate.txn.mint_01.txt deleted file mode 100644 index a9637cc964..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.mint_01.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020003745607a08b12634e402eec525ddaaaaab73cc3951cd232cb88ad934f4be717f6, 0x0101085757) diff --git a/mintscript/src/tests/translate/snap.translate.txn.mint_02.txt b/mintscript/src/tests/translate/snap.translate.txn.mint_02.txt deleted file mode 100644 index 7d85876d3d..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.mint_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020003745607a08b12634e402eec525ddaaaaab73cc3951cd232cb88ad934f4be717f6, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.txn.newpool_00.txt b/mintscript/src/tests/translate/snap.translate.txn.newpool_00.txt deleted file mode 100644 index 6cb31ca1bf..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.newpool_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085353) diff --git a/mintscript/src/tests/translate/snap.translate.txn.prodblock_00.txt b/mintscript/src/tests/translate/snap.translate.txn.prodblock_00.txt deleted file mode 100644 index c93e6dc95e..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.prodblock_00.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Stake pool e0e0…e0e0 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.prodblock_01.txt b/mintscript/src/tests/translate/snap.translate.txn.prodblock_01.txt deleted file mode 100644 index 5162fe2be0..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.prodblock_01.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Stake pool e1e1…e1e1 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.prodblock_02.txt b/mintscript/src/tests/translate/snap.translate.txn.prodblock_02.txt deleted file mode 100644 index 3362bb16d2..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.prodblock_02.txt +++ /dev/null @@ -1 +0,0 @@ -ERROR: Stake pool e2e2…e2e2 does not exist \ No newline at end of file diff --git a/mintscript/src/tests/translate/snap.translate.txn.prodblock_03.txt b/mintscript/src/tests/translate/snap.translate.txn.prodblock_03.txt deleted file mode 100644 index 772e72bd26..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.prodblock_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086464) diff --git a/mintscript/src/tests/translate/snap.translate.txn.prodblock_04.txt b/mintscript/src/tests/translate/snap.translate.txn.prodblock_04.txt deleted file mode 100644 index 4d81c84ae8..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.prodblock_04.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x0200024efcfcb197750301c44ffc5a8b176159a2c5de0b9945c5998245054efea6ac89, 0x0101086565) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfer_00.txt b/mintscript/src/tests/translate/snap.translate.txn.transfer_00.txt deleted file mode 100644 index 1b2f3ec6e7..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfer_00.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020003e843fa18427b5e71eb6b94eaffcbf52ddc8dc6e843d259f31d7d5566ddc1b6c2, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfer_01.txt b/mintscript/src/tests/translate/snap.translate.txn.transfer_01.txt deleted file mode 100644 index 0cd13f2ebd..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfer_01.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085151) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfer_02.txt b/mintscript/src/tests/translate/snap.translate.txn.transfer_02.txt deleted file mode 100644 index 3d29c7fbb9..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfer_02.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x011212121212121212121212121212121212121212, 0x0101085252) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfer_03.txt b/mintscript/src/tests/translate/snap.translate.txn.transfer_03.txt deleted file mode 100644 index 48791373a0..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfer_03.txt +++ /dev/null @@ -1 +0,0 @@ -signature(0x011212121212121212121212121212121212121212, 0x0000) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfertl_00.txt b/mintscript/src/tests/translate/snap.translate.txn.transfertl_00.txt deleted file mode 100644 index 3357487ade..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfertl_00.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - after_blocks(600), - signature(0x020003e843fa18427b5e71eb6b94eaffcbf52ddc8dc6e843d259f31d7d5566ddc1b6c2, 0x0101085d5d), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfertl_01.txt b/mintscript/src/tests/translate/snap.translate.txn.transfertl_01.txt deleted file mode 100644 index aa56ba4776..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfertl_01.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - until_height(155554), - signature(0x020002a3fe239606e407ea161143e42c7c3ef0059573466950a910b28289df247df7a3, 0x0101085959), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfertl_02.txt b/mintscript/src/tests/translate/snap.translate.txn.transfertl_02.txt deleted file mode 100644 index 6314f79cac..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfertl_02.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - after_seconds(31536000), - signature(0x02000253f0022f209dfa5c224294e4aaf337dc062ec9f689fcc04b4f2196a71fad3758, 0x0101085a5a), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfertl_03.txt b/mintscript/src/tests/translate/snap.translate.txn.transfertl_03.txt deleted file mode 100644 index 1264d19fc5..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfertl_03.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - until_time(1718120714), - signature(0x0200039315c9da756f584d5a7fff618d230bf13115a43d63e7c7d464bb513ab6be7bbc, 0x0101085b5b), -]) diff --git a/mintscript/src/tests/translate/snap.translate.txn.transfertl_04.txt b/mintscript/src/tests/translate/snap.translate.txn.transfertl_04.txt deleted file mode 100644 index 0f276b7040..0000000000 --- a/mintscript/src/tests/translate/snap.translate.txn.transfertl_04.txt +++ /dev/null @@ -1,4 +0,0 @@ -threshold(2, [ - until_height(999999), - signature(0x020002ebcadc73233ea7fc2c8e2e5bcafc7dd4b46444a60d9b5bc9a965d2c6d8a44ebb, 0x0000), -]) diff --git a/utils/src/concatln.rs b/utils/src/concatln.rs new file mode 100644 index 0000000000..891a3ab2f7 --- /dev/null +++ b/utils/src/concatln.rs @@ -0,0 +1,45 @@ +// Copyright (c) 2021-2025 RBB S.r.l +// opensource@mintlayer.org +// SPDX-License-Identifier: MIT +// Licensed under the MIT License; +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://github.com/mintlayer/mintlayer-core/blob/master/LICENSE +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/// Same as `concat!`, but also adds "\n" to every line except the last one. +#[macro_export] +macro_rules! concatln { + ($e:expr $(,)?) => { $e }; + ($e:expr, $($tail:expr),* $(,)?) => { concat!($e, "\n", concatln!($($tail),*)) }; +} + +#[cfg(test)] +mod tests { + #[test] + fn test_concatln() { + let s = concatln!("a"); + assert_eq!(s, "a"); + + let s = concatln!("a",); + assert_eq!(s, "a"); + + let s = concatln!("a", "b"); + assert_eq!(s, "a\nb"); + + let s = concatln!("a", "b",); + assert_eq!(s, "a\nb"); + + let s = concatln!("a", "b", "c"); + assert_eq!(s, "a\nb\nc"); + + let s = concatln!("a", "b", "c",); + assert_eq!(s, "a\nb\nc"); + } +} diff --git a/utils/src/lib.rs b/utils/src/lib.rs index cfc411c5aa..a5baf56463 100644 --- a/utils/src/lib.rs +++ b/utils/src/lib.rs @@ -18,6 +18,7 @@ pub mod atomics; pub mod blockuntilzero; pub mod bloom_filters; pub mod clap_utils; +pub mod concatln; pub mod config_setting; pub mod const_nonzero; pub mod const_value; From e4878c032163cd5b4576b04b69c036ffd335398d Mon Sep 17 00:00:00 2001 From: Mykhailo Kremniov Date: Thu, 3 Jul 2025 11:25:19 +0300 Subject: [PATCH 2/2] Fix spurious test failures due to low initial amounts; fix clippy error about large enum variant --- chainstate/test-suite/src/tests/input_commitments.rs | 8 ++++---- wallet/types/src/partially_signed_transaction.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chainstate/test-suite/src/tests/input_commitments.rs b/chainstate/test-suite/src/tests/input_commitments.rs index 30d9bd3994..1d742cfb76 100644 --- a/chainstate/test-suite/src/tests/input_commitments.rs +++ b/chainstate/test-suite/src/tests/input_commitments.rs @@ -356,9 +356,9 @@ fn order_fill(#[case] seed: Seed, #[case] orders_version: OrdersVersion) { ); let coins_left = tf.coin_amount_from_utxo(&coins_outpoint); - let initial_ask_amount = Amount::from_atoms(rng.gen_range(1u128..1000)); + let initial_ask_amount = Amount::from_atoms(rng.gen_range(10..1000)); let initial_give_amount = - Amount::from_atoms(rng.gen_range(1u128..=token_amount_to_mint.into_atoms())); + Amount::from_atoms(rng.gen_range(10..=token_amount_to_mint.into_atoms())); let initially_asked = OutputValue::Coin(initial_ask_amount); let initially_given = OutputValue::TokenV1(token_id, initial_give_amount); let order_data = OrderData::new( @@ -646,9 +646,9 @@ fn order_conclude(#[case] seed: Seed, #[case] orders_version: OrdersVersion) { PrivateKey::new_from_rng(&mut rng, KeyKind::Secp256k1Schnorr); let order_owner_dest = Destination::PublicKey(order_owner_pk); - let initial_ask_amount = Amount::from_atoms(rng.gen_range(1u128..1000)); + let initial_ask_amount = Amount::from_atoms(rng.gen_range(10..1000)); let initial_give_amount = - Amount::from_atoms(rng.gen_range(1u128..=token_amount_to_mint.into_atoms())); + Amount::from_atoms(rng.gen_range(10..=token_amount_to_mint.into_atoms())); let initially_asked = OutputValue::Coin(initial_ask_amount); let initially_given = OutputValue::TokenV1(token_id, initial_give_amount); let order_data = OrderData::new( diff --git a/wallet/types/src/partially_signed_transaction.rs b/wallet/types/src/partially_signed_transaction.rs index 99caacb572..1dd4fab7a1 100644 --- a/wallet/types/src/partially_signed_transaction.rs +++ b/wallet/types/src/partially_signed_transaction.rs @@ -45,7 +45,7 @@ use utils::ensure; #[derive(Error, Debug, Clone, PartialEq, Eq)] pub enum PartiallySignedTransactionError { #[error("Failed to convert partially signed tx to signed")] - FailedToConvertPartiallySignedTx(PartiallySignedTransaction), + FailedToConvertPartiallySignedTx(Box), #[error("Failed to create transaction: {0}")] TxCreationError(TransactionCreationError), @@ -439,7 +439,7 @@ impl PartiallySignedTransaction { Ok(SignedTransaction::new(self.tx, witnesses) .map_err(PartiallySignedTransactionError::TxCreationError)?) } else { - Err(PartiallySignedTransactionError::FailedToConvertPartiallySignedTx(self)) + Err(PartiallySignedTransactionError::FailedToConvertPartiallySignedTx(Box::new(self))) } }