update submit-tx

[bytom/shuttle.git] / swap / transaction_test.go

diff --git a/swap/transaction_test.go b/swap/transaction_test.go
index 4341738..4ea63d6 100644 (file)
--- a/swap/transaction_test.go
+++ b/swap/transaction_test.go
@@ -25,7 +25,7 @@ func TestBuildTx(t *testing.T) {
        guid := "e18b91ba-91a5-4837-9d41-ce2b76cea81c" // acount a1
        fee := uint64(40000000)
        confirmations := uint64(1)
-       outputID := "21f174b985c667fcbf79d07a7b2e58a91a37d13d28f354978acaa70c822e0b97"
+       outputID := "fa898bb1daa5c7bf799809c01823edaafec0af920f7ab6de26dd17aa7e6c29a4"
        lockedAsset := "bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a"
        lockedAmount := uint64(1)
        contractProgram := "202cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b98240164206ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d20eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c2437422547a6418000000557aa8547a88537a7bae7cac63220000007bcd9f69537a7cae7cac00c0"
@@ -45,7 +45,7 @@ func TestBuildUnlockedTx(t *testing.T) {
        guid := "e18b91ba-91a5-4837-9d41-ce2b76cea81c" // acount a1
        fee := uint64(40000000)
        confirmations := uint64(1)
-       contractUTXOID := "aa6cecf0c8768c05182ce5389d5a70c9fb9ca6e5697dc098568ffcc735093235"
+       contractUTXOID := "11317c0bf0c39b7b1d3082a292e6ecbd010d59cdf59007d44ea7bc7b9c36c337"
        contractAsset := "bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a"
        spendWalletAmount := fee
        receiver := "sm1qe5gne93c8wx75ualxkju5yyec20j54ynjxd8zj" // account a4
@@ -64,13 +64,14 @@ func TestBuildUnlockedTx(t *testing.T) {
 
 func TestSubmitPayment(t *testing.T) {
        guid := "e18b91ba-91a5-4837-9d41-ce2b76cea81c" // acount a1
-       rawTx := "0701000201620160ab5d3e83a2055d7d02381106a1b4fd44af5c4fac2fbaa2dde5e40a6e5a49932fbae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3ab0b7a5f4a9e91502011600145b0a81adc5c2d68a9967082a09c96e82d62aa05801000161015f8057da31069f7630b2985d4a328b6d3c2d353652dbd2a3f44d54ba6085524ddcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8099c4d5990100011600145b0a81adc5c2d68a9967082a09c96e82d62aa058220120eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c2430301af01bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a01018b01202cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b98240164206ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d20eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c2437422547a6418000000557aa8547a88537a7bae7cac63220000007bcd9f69537a7cae7cac00c000013fbae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3aafb7a5f4a9e915011600145b0a81adc5c2d68a9967082a09c96e82d62aa05800013effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80e5bac29901011600145b0a81adc5c2d68a9967082a09c96e82d62aa05800"
+       rawTx := "0701000201620160b631510ab58859eb6834068a3ec9dc6104efe8c13fba707908279be029b8a29abae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3aafb7a5f4a9e91501011600145b0a81adc5c2d68a9967082a09c96e82d62aa05801000161015f39276de0fc73758efc6753169284862e2ca67ab6218ae6500ef23f9ca87f8f2cffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8099c4d5990100011600145b0a81adc5c2d68a9967082a09c96e82d62aa058220120eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c2430301af01bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a01018b01202cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b98240164206ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d20eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c2437422547a6418000000557aa8547a88537a7bae7cac63220000007bcd9f69537a7cae7cac00c000013effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80e5bac29901011600145b0a81adc5c2d68a9967082a09c96e82d62aa05800013fbae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3aaeb7a5f4a9e915011600145b0a81adc5c2d68a9967082a09c96e82d62aa05800"
        memo := ""
-       spendUTXOSig := "ca5058e664c716dd7f086affc2026080de97237bb2aa73963aae6328baf4142b866fb0288039578a1eb85f50b5aaaa7c4f0a4985a7f6bd3b3c03b3e1cb6dee0e"
-       spendUTXOPublicKey := "eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c243"
-       spendWalletSig := "a95af3c493e147f216d433d75e015d137cf6bcf10ec33dc5c8a152c10c7a05bb65dd91815e93f4ecbaaa7a4a390bab71e70beb1a2257b11b052047a61a93de01"
+       spendUTXOSig := "749ebba8f0e59d9815b50bc9440667d7d5ff09baffa48c057b7d17e547e8f88e571cc690a791194c610ac5e4c91494031ac1142ffd7a13f48b548d6ab3a89a06"
+       spendUTXOPublicKey := "6ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d"
+       spendWalletSig := "c7bf8f1f18ac9bf94c051c80d3d6f9ce52e2edda3f4d36c37d795d747d649a6776d99d28e88eba7f1a1e521b25216f17b0f032d78b8c0c1c8a53e2c42d6e220c"
 
-       txID, err := submitPayment(server, guid, rawTx, memo, spendUTXOSig, spendUTXOPublicKey, spendWalletSig)
+       spendUTXOSignatures := append([]string{}, spendUTXOSig, spendUTXOPublicKey)
+       txID, err := submitPayment(server, guid, rawTx, memo, spendWalletSig, spendUTXOSignatures)
        if err != nil {
                fmt.Println(err)
        }
@@ -79,13 +80,15 @@ func TestSubmitPayment(t *testing.T) {
 
 func TestSubmitUnlockedPayment(t *testing.T) {
        guid := "e18b91ba-91a5-4837-9d41-ce2b76cea81c" // acount a1
-       rawTx := "0701000201d30101d001b631510ab58859eb6834068a3ec9dc6104efe8c13fba707908279be029b8a29abae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a0100018b01202cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b98240164206ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d20eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c2437422547a6418000000557aa8547a88537a7bae7cac63220000007bcd9f69537a7cae7cac00c001000161015f1acbe8bc0d8772def4fa94a87a060aa6e8f26a3b6d2d06cd5680e9ab3ee3067affffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8099c4d5990100011600145b0a81adc5c2d68a9967082a09c96e82d62aa058220120eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c243020139bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a0101160014cd113c96383b8dea73bf35a5ca1099c29f2a549300013effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80e5bac29901011600145b0a81adc5c2d68a9967082a09c96e82d62aa05800"
+       rawTx := "0701000201d30101d0013b2c6b69759cd0a2245b2f1a5681cf782e485f077a86ed13f82cae677a671d66bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a0100018b01202cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b98240164206ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d20eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c2437422547a6418000000557aa8547a88537a7bae7cac63220000007bcd9f69537a7cae7cac00c001000161015fabf3111e8449df088eda1072c1bd4322157b62f588d8817d36f548f444092591ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8099c4d5990100011600145b0a81adc5c2d68a9967082a09c96e82d62aa058220120eec15ce68d46569f92ecebd7769101b22e34109892cc7ddfd54dc772f850c243020139bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a0101160014cd113c96383b8dea73bf35a5ca1099c29f2a549300013effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80e5bac29901011600145b0a81adc5c2d68a9967082a09c96e82d62aa05800"
        memo := ""
        preimage := "68656c6c6f" // hex("hello")
-       spendUTXOSig := "02bf47859fb4893429df57ac9a69a1ec592a68206cc24b54d1bf747cdc5698ba96cd627f8b8b6e22dbcdaee79855507d1e4fa4cd57bbb800f0f3023306dd8207"
-       spendWalletSig := "868617bbfd2ca48f17ae4dd1eca55e07fab2a250f804400e9b5f62d46394613c038bd1f95e9b427500a91d9da82d2b95b732d3b4780caa13dcdb849301f47700"
+       spendUTXOSig := "749ebba8f0e59d9815b50bc9440667d7d5ff09baffa48c057b7d17e547e8f88e571cc690a791194c610ac5e4c91494031ac1142ffd7a13f48b548d6ab3a89a06"
+       spendWalletSig := "c7bf8f1f18ac9bf94c051c80d3d6f9ce52e2edda3f4d36c37d795d747d649a6776d99d28e88eba7f1a1e521b25216f17b0f032d78b8c0c1c8a53e2c42d6e220c"
 
-       txID, err := submitUnlockedPayment(server, guid, rawTx, memo, preimage, spendUTXOSig, spendWalletSig)
+       spendUTXOSignatures := append([]string{}, preimage, spendUTXOSig, "")
+       txID, err := submitPayment(server, guid, rawTx, memo, spendWalletSig, spendUTXOSignatures)
+       // txID, err := submitUnlockedPayment(server, guid, rawTx, memo, spendWalletSig, spendUTXOSignatures)
        if err != nil {
                fmt.Println(err)
        }