Revert "update master (#487)" (#518)

[bytom/bytom.git] / test / integration / standard_transaction_test.go

diff --git a/test/integration/standard_transaction_test.go b/test/integration/standard_transaction_test.go
index 391ed7b..063d02a 100644 (file)
--- a/test/integration/standard_transaction_test.go
+++ b/test/integration/standard_transaction_test.go
@@ -7,16 +7,16 @@ import (
 
        dbm "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/account"
+       "github.com/bytom/blockchain/account"
        "github.com/bytom/blockchain/pseudohsm"
        "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/protocol/bc/legacy"
        "github.com/bytom/protocol/validation"
        "github.com/bytom/test"
 )
 
 func TestP2PKH(t *testing.T) {
-       dirPath, err := ioutil.TempDir(".", "TestP2PKH")
+       dirPath, err := ioutil.TempDir(".", "")
        if err != nil {
                t.Fatal(err)
        }
@@ -36,7 +36,7 @@ func TestP2PKH(t *testing.T) {
                t.Fatal(err)
        }
 
-       xpub, err := hsm.XCreate("TestP2PKH", "password")
+       xpub, err := hsm.XCreate("test_pub", "password")
        if err != nil {
                t.Fatal(err)
        }
@@ -57,17 +57,17 @@ func TestP2PKH(t *testing.T) {
                t.Fatal(err)
        }
 
-       if _, err := test.MockSign(tpl, hsm, "password"); err != nil {
+       if err := test.MockSign(tpl, hsm); err != nil {
                t.Fatal(err)
        }
 
-       if _, err = validation.ValidateTx(types.MapTx(tx), test.MockBlock()); err != nil {
+       if _, _, err = validation.ValidateTx(legacy.MapTx(tx), test.MockBlock()); err != nil {
                t.Fatal(err)
        }
 }
 
 func TestP2SH(t *testing.T) {
-       dirPath, err := ioutil.TempDir(".", "TestP2SH")
+       dirPath, err := ioutil.TempDir(".", "")
        if err != nil {
                t.Fatal(err)
        }
@@ -87,12 +87,12 @@ func TestP2SH(t *testing.T) {
                t.Fatal(err)
        }
 
-       xpub1, err := hsm.XCreate("TestP2SH1", "password")
+       xpub1, err := hsm.XCreate("test_pub1", "password")
        if err != nil {
                t.Fatal(err)
        }
 
-       xpub2, err := hsm.XCreate("TestP2SH2", "password")
+       xpub2, err := hsm.XCreate("test_pub2", "password")
        if err != nil {
                t.Fatal(err)
        }
@@ -113,81 +113,11 @@ func TestP2SH(t *testing.T) {
                t.Fatal(err)
        }
 
-       if _, err := test.MockSign(tpl, hsm, "password"); err != nil {
+       if err := test.MockSign(tpl, hsm); err != nil {
                t.Fatal(err)
        }
 
-       if _, err = validation.ValidateTx(types.MapTx(tx), test.MockBlock()); err != nil {
-               t.Fatal(err)
-       }
-}
-
-func TestMutilNodeSign(t *testing.T) {
-       dirPath, err := ioutil.TempDir(".", "TestMutilNodeSign")
-       if err != nil {
-               t.Fatal(err)
-       }
-       defer os.RemoveAll(dirPath)
-
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
-       defer os.RemoveAll("temp")
-
-       chain, err := test.MockChain(testDB)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       accountManager := account.NewManager(testDB, chain)
-       hsm, err := pseudohsm.New(dirPath)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       xpub1, err := hsm.XCreate("TestMutilNodeSign1", "password1")
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       xpub2, err := hsm.XCreate("TestMutilNodeSign2", "password2")
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       testAccount, err := accountManager.Create(nil, []chainkd.XPub{xpub1.XPub, xpub2.XPub}, 2, "testAccount", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       controlProg, err := accountManager.CreateAddress(nil, testAccount.ID, false)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       utxo := test.MockUTXO(controlProg)
-       tpl, tx, err := test.MockTx(utxo, testAccount)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       if finishSign, err := test.MockSign(tpl, hsm, "password"); err != nil {
-               t.Fatal(err)
-       } else if finishSign == true {
-               t.Fatal("sign progress is finish, but either xpub1 nor xpub2 is signed")
-       }
-
-       if finishSign, err := test.MockSign(tpl, hsm, "password1"); err != nil {
-               t.Fatal(err)
-       } else if finishSign == true {
-               t.Fatal("sign progress is finish, but xpub2 is not signed")
-       }
-
-       if finishSign, err := test.MockSign(tpl, hsm, "password2"); err != nil {
-               t.Fatal(err)
-       } else if finishSign == false {
-               t.Fatal("sign progress is not finish,  but both xpub1 and xpub2 is signed")
-       }
-
-       if _, err = validation.ValidateTx(types.MapTx(tx), test.MockBlock()); err != nil {
+       if _, _, err = validation.ValidateTx(legacy.MapTx(tx), test.MockBlock()); err != nil {
                t.Fatal(err)
        }
 }