refactor handler related tests (#464)

* refactor handler related tests

* fix imports

diff --git a/blockchain/account/accounts_test.go b/blockchain/account/accounts_test.go
index be40806..ec1765d 100644 (file)
--- a/blockchain/account/accounts_test.go
+++ b/blockchain/account/accounts_test.go
@@ -4,6 +4,7 @@ import (
        "context"
        "io/ioutil"
        "os"
+       "reflect"
        "testing"
 
        dbm "github.com/tendermint/tmlibs/db"
@@ -85,6 +86,73 @@ func TestDeleteAccount(t *testing.T) {
        }
 }
 
+func TestUpdateAccountTags(t *testing.T) {
+       dirPath, err := ioutil.TempDir(".", "")
+       if err != nil {
+               t.Fatal(err)
+       }
+       defer os.RemoveAll(dirPath)
+
+       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       defer os.RemoveAll("temp")
+
+       store := txdb.NewStore(testDB)
+       txPool := protocol.NewTxPool()
+       chain, err := protocol.NewChain(bc.Hash{}, store, txPool)
+       if err != nil {
+               t.Fatal(err)
+       }
+
+       m := NewManager(testDB, chain)
+       ctx := context.Background()
+
+       account, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "account-alias",
+               map[string]interface{}{
+                       "test_tag": "v0",
+               })
+       if err != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       // Update by ID
+       wantTags := map[string]interface{}{
+               "test_tag": "v1",
+       }
+
+       if m.UpdateTags(ctx, account.ID, wantTags) != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       account1, err := m.FindByAlias(ctx, account.Alias)
+       if err != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       gotTags := account1.Tags
+       if !reflect.DeepEqual(gotTags, wantTags) {
+               t.Fatalf("tags:\ngot:  %v\nwant: %v", gotTags, wantTags)
+       }
+
+       // Update by alias
+       wantTags = map[string]interface{}{
+               "test_tag": "v2",
+       }
+
+       if m.UpdateTags(ctx, account.Alias, wantTags) != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       account2, err := m.FindByAlias(ctx, account.Alias)
+       if err != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       gotTags = account2.Tags
+       if !reflect.DeepEqual(gotTags, wantTags) {
+               t.Fatalf("tags:\ngot:  %v\nwant: %v", gotTags, wantTags)
+       }
+}
+
 func TestFindByID(t *testing.T) {
        m := mockAccountManager(t)
        ctx := context.Background()

diff --git a/blockchain/accounts_test.go b/blockchain/accounts_test.go
deleted file mode 100644 (file)
index 426b44f..0000000
--- a/blockchain/accounts_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package blockchain
-
-import (
-       "context"
-       "io/ioutil"
-       "os"
-       "reflect"
-       "testing"
-
-       dbm "github.com/tendermint/tmlibs/db"
-
-       "github.com/bytom/blockchain/account"
-       "github.com/bytom/blockchain/txdb"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
-)
-
-func TestUpdateAccountTags(t *testing.T) {
-       dirPath, err := ioutil.TempDir(".", "")
-       if err != nil {
-               t.Fatal(err)
-       }
-       defer os.RemoveAll(dirPath)
-
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
-       defer os.RemoveAll("temp")
-
-       store := txdb.NewStore(testDB)
-       txPool := protocol.NewTxPool()
-       chain, err := protocol.NewChain(bc.Hash{}, store, txPool)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       m := account.NewManager(testDB, chain)
-       ctx := context.Background()
-
-       account, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "account-alias",
-               map[string]interface{}{
-                       "test_tag": "v0",
-               })
-       if err != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       // Update by ID
-       wantTags := map[string]interface{}{
-               "test_tag": "v1",
-       }
-
-       if m.UpdateTags(ctx, account.ID, wantTags) != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       account1, err := m.FindByAlias(ctx, account.Alias)
-       if err != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       gotTags := account1.Tags
-       if !reflect.DeepEqual(gotTags, wantTags) {
-               t.Fatalf("tags:\ngot:  %v\nwant: %v", gotTags, wantTags)
-       }
-
-       // Update by alias
-       wantTags = map[string]interface{}{
-               "test_tag": "v2",
-       }
-
-       if m.UpdateTags(ctx, account.Alias, wantTags) != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       account2, err := m.FindByAlias(ctx, account.Alias)
-       if err != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       gotTags = account2.Tags
-       if !reflect.DeepEqual(gotTags, wantTags) {
-               t.Fatalf("tags:\ngot:  %v\nwant: %v", gotTags, wantTags)
-       }
-}

diff --git a/blockchain/asset/asset_test.go b/blockchain/asset/asset_test.go
index babaafe..88eca72 100644 (file)
--- a/blockchain/asset/asset_test.go
+++ b/blockchain/asset/asset_test.go
@@ -4,6 +4,7 @@ import (
        "context"
        "io/ioutil"
        "os"
+       "reflect"
        "testing"
 
        dbm "github.com/tendermint/tmlibs/db"
@@ -50,7 +51,73 @@ func TestFindAssetByID(t *testing.T) {
        if !testutil.DeepEqual(asset, found) {
                t.Errorf("expected %v and %v to match", asset, found)
        }
+}
+
+func TestUpdateAssetTags(t *testing.T) {
+       dirPath, err := ioutil.TempDir(".", "")
+       if err != nil {
+               t.Fatal(err)
+       }
+       defer os.RemoveAll(dirPath)
+
+       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       defer os.RemoveAll("temp")
+
+       store := txdb.NewStore(testDB)
+       txPool := protocol.NewTxPool()
+       chain, err := protocol.NewChain(bc.Hash{}, store, txPool)
+       if err != nil {
+               t.Fatal(err)
+       }
+
+       reg := NewRegistry(testDB, chain)
+       ctx := context.Background()
+
+       asset, err := reg.Define([]chainkd.XPub{testutil.TestXPub}, 1, nil, "asset-alias",
+               map[string]interface{}{
+                       "test_tag": "v0",
+               })
+       if err != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       // Update by ID
+       wantTags := map[string]interface{}{
+               "test_tag": "v1",
+       }
+
+       if reg.UpdateTags(ctx, asset.AssetID.String(), wantTags) != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       asset1, err := reg.FindByAlias(ctx, *asset.Alias)
+       if err != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       gotTags := asset1.Tags
+       if !reflect.DeepEqual(gotTags, wantTags) {
+               t.Fatalf("tags:\ngot:  %v\nwant: %v", gotTags, wantTags)
+       }
+
+       // Update by alias
+       wantTags = map[string]interface{}{
+               "test_tag": "v2",
+       }
+
+       if reg.UpdateTags(ctx, *asset.Alias, wantTags) != nil {
+               testutil.FatalErr(t, err)
+       }
 
+       asset2, err := reg.FindByAlias(ctx, *asset.Alias)
+       if err != nil {
+               testutil.FatalErr(t, err)
+       }
+
+       gotTags = asset2.Tags
+       if !reflect.DeepEqual(gotTags, wantTags) {
+               t.Fatalf("tags:\ngot:  %v\nwant: %v", gotTags, wantTags)
+       }
 }
 
 func mockChain(testDB dbm.DB) (*protocol.Chain, error) {

diff --git a/blockchain/assets_test.go b/blockchain/assets_test.go
deleted file mode 100644 (file)
index bb9cb90..0000000
--- a/blockchain/assets_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package blockchain
-
-import (
-       "context"
-       "io/ioutil"
-       "os"
-       "reflect"
-       "testing"
-
-       dbm "github.com/tendermint/tmlibs/db"
-
-       "github.com/bytom/blockchain/asset"
-       "github.com/bytom/blockchain/txdb"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
-)
-
-func TestUpdateAssetTags(t *testing.T) {
-       dirPath, err := ioutil.TempDir(".", "")
-       if err != nil {
-               t.Fatal(err)
-       }
-       defer os.RemoveAll(dirPath)
-
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
-       defer os.RemoveAll("temp")
-
-       store := txdb.NewStore(testDB)
-       txPool := protocol.NewTxPool()
-       chain, err := protocol.NewChain(bc.Hash{}, store, txPool)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       reg := asset.NewRegistry(testDB, chain)
-       ctx := context.Background()
-
-       asset, err := reg.Define([]chainkd.XPub{testutil.TestXPub}, 1, nil, "asset-alias",
-               map[string]interface{}{
-                       "test_tag": "v0",
-               })
-       if err != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       // Update by ID
-       wantTags := map[string]interface{}{
-               "test_tag": "v1",
-       }
-
-       if reg.UpdateTags(ctx, asset.AssetID.String(), wantTags) != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       asset1, err := reg.FindByAlias(ctx, *asset.Alias)
-       if err != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       gotTags := asset1.Tags
-       if !reflect.DeepEqual(gotTags, wantTags) {
-               t.Fatalf("tags:\ngot:  %v\nwant: %v", gotTags, wantTags)
-       }
-
-       // Update by alias
-       wantTags = map[string]interface{}{
-               "test_tag": "v2",
-       }
-
-       if reg.UpdateTags(ctx, *asset.Alias, wantTags) != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       asset2, err := reg.FindByAlias(ctx, *asset.Alias)
-       if err != nil {
-               testutil.FatalErr(t, err)
-       }
-
-       gotTags = asset2.Tags
-       if !reflect.DeepEqual(gotTags, wantTags) {
-               t.Fatalf("tags:\ngot:  %v\nwant: %v", gotTags, wantTags)
-       }
-}

diff --git a/blockchain/hsm_test.go b/blockchain/hsm_test.go
deleted file mode 100755 (executable)
index dc5cded..0000000
--- a/blockchain/hsm_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package blockchain
-
-import (
-       "context"
-       "fmt"
-       "io/ioutil"
-       "os"
-       "testing"
-       "time"
-
-       dbm "github.com/tendermint/tmlibs/db"
-
-       "github.com/bytom/blockchain/account"
-       "github.com/bytom/blockchain/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/blockchain/txdb"
-       cfg "github.com/bytom/config"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-)
-
-const dirPath = "pseudohsm/testdata/pseudo"
-
-func TestHSM(t *testing.T) {
-       ctx := context.Background()
-
-       dir := tmpManager(t)
-       defer os.RemoveAll(dir)
-
-       config := cfg.DefaultConfig()
-       tc := dbm.NewDB("txdb", config.DBBackend, dir)
-       store := txdb.NewStore(tc)
-
-       var accounts *account.Manager
-       var assets *asset.Registry
-       // tx pool init
-       txPool := protocol.NewTxPool()
-       chain, err := protocol.NewChain(bc.Hash{}, store, txPool)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       walletDB := dbm.NewDB("wallet", config.DBBackend, dir)
-       accounts = account.NewManager(walletDB, chain)
-       assets = asset.NewRegistry(walletDB, chain)
-
-       hsm, err := pseudohsm.New(dirPath)
-       if err != nil {
-               t.Fatal(err)
-       }
-       xpub1, err := hsm.XCreate("xpub1", "password")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xpub2, err := hsm.XCreate("xpub2", "password")
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       acct1, err := accounts.Create(ctx, []chainkd.XPub{xpub1.XPub}, 1, "acc1", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-       acct2, err := accounts.Create(ctx, []chainkd.XPub{xpub2.XPub}, 1, "acc2", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       assetDef1 := map[string]interface{}{"foo": 1}
-       assetDef2 := map[string]interface{}{"foo": 2}
-
-       asset1, err := assets.Define([]chainkd.XPub{xpub1.XPub}, 1, assetDef1, "foo1", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-       asset2, err := assets.Define([]chainkd.XPub{xpub2.XPub}, 1, assetDef2, "foo2", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       issue1 := txbuilder.Action(assets.NewIssueAction(bc.AssetAmount{AssetId: &asset1.AssetID, Amount: 100}))
-       issue2 := txbuilder.Action(assets.NewIssueAction(bc.AssetAmount{AssetId: &asset2.AssetID, Amount: 200}))
-       spend1 := accounts.NewControlAction(bc.AssetAmount{AssetId: &asset1.AssetID, Amount: 100}, acct1.ID, nil)
-       spend2 := accounts.NewControlAction(bc.AssetAmount{AssetId: &asset2.AssetID, Amount: 200}, acct2.ID, nil)
-
-       tmpl, err := txbuilder.Build(ctx, nil, []txbuilder.Action{issue1, issue2, spend1, spend2}, time.Now().Add(time.Minute))
-       if err != nil {
-               t.Fatal(err)
-       }
-       //go accounts.ProcessBlocks(ctx)
-
-       err = txbuilder.Sign(ctx, tmpl, nil, "password", func(_ context.Context, xpub chainkd.XPub, path [][]byte, data [32]byte, password string) ([]byte, error) {
-               sigBytes, err := hsm.XSign(xpub, path, data[:], password)
-               if err != nil {
-                       return nil, nil
-               }
-               return sigBytes, err
-       })
-
-       fmt.Printf("###data: %v#####", *tmpl)
-       err = hsm.XDelete(xpub1.XPub, "password")
-       if err != nil {
-               t.Fatal(err)
-       }
-       err = hsm.XDelete(xpub2.XPub, "password")
-       if err != nil {
-               t.Fatal(err)
-       }
-}
-
-func tmpManager(t *testing.T) string {
-       d, err := ioutil.TempDir("", "bytom-keystore-test")
-       if err != nil {
-               t.Fatal(err)
-       }
-       return d
-}