From a3e621484e6e5b37724acfe659b3851a8d76d03d Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Tue, 31 May 2016 18:35:22 +0200
Subject: [PATCH] move account back up to top level to avoid cyclical import of
core over transaction
---
core/pipe.go | 19 ++--
core/types/account.go | 112 --------------------
core/types/priv_account.go | 105 ------------------
core/types/types.go | 11 +-
erisdb/params.go | 2 +-
erisdb/pipe/accounts.go | 2 +-
erisdb/pipe/pipe.go | 2 +-
erisdb/pipe/transactor.go | 2 +-
erisdb/pipe/types.go | 2 +-
manager/eris-mint/state/block_cache.go | 2 +-
manager/eris-mint/state/common.go | 2 +-
manager/eris-mint/state/execution.go | 2 +-
manager/eris-mint/state/genesis_test.go | 2 +-
manager/eris-mint/state/permissions_test.go | 2 +-
manager/eris-mint/state/state.go | 2 +-
manager/eris-mint/state/tx_cache.go | 2 +-
rpc/client/client.go | 2 +-
rpc/core/accounts.go | 2 +-
rpc/core/routes.go | 2 +-
rpc/core/txs.go | 2 +-
rpc/core/types/responses.go | 2 +-
rpc/test/helpers.go | 2 +-
test/mock/mock_web_api_test.go | 2 +-
test/mock/pipe.go | 2 +-
test/testdata/testdata/testdata.go | 2 +-
test/web_api/web_api_test.go | 2 +-
txs/tx.go | 2 +-
txs/tx_test.go | 2 +-
txs/tx_utils.go | 2 +-
29 files changed, 41 insertions(+), 256 deletions(-)
delete mode 100644 core/types/account.go
delete mode 100644 core/types/priv_account.go
diff --git a/core/pipe.go b/core/pipe.go
index 4414c9e3..ebd0b272 100644
--- a/core/pipe.go
+++ b/core/pipe.go
@@ -32,7 +32,8 @@ import (
events "github.com/tendermint/go-events"
tendermint_types "github.com/tendermint/tendermint/types"
- transactions "github.com/eris-ltd/eris-db/txs"
+ account "github.com/eris-ltd/eris-db/account"
+ transaction "github.com/eris-ltd/eris-db/txs"
)
type Pipe interface {
@@ -46,10 +47,10 @@ type Pipe interface {
}
type Accounts interface {
- GenPrivAccount() (*types.PrivAccount, error)
- GenPrivAccountFromKey(privKey []byte) (*types.PrivAccount, error)
+ GenPrivAccount() (*account.PrivAccount, error)
+ GenPrivAccountFromKey(privKey []byte) (*account.PrivAccount, error)
Accounts([]*types.FilterData) (*types.AccountList, error)
- Account(address []byte) (*types.Account, error)
+ Account(address []byte) (*account.Account, error)
Storage(address []byte) (*types.Storage, error)
StorageAt(address, key []byte) (*types.StorageItem, error)
}
@@ -75,7 +76,7 @@ type EventEmitter interface {
}
type NameReg interface {
- Entry(key string) (*transactions.NameRegEntry, error)
+ Entry(key string) (*transaction.NameRegEntry, error)
Entries([]*types.FilterData) (*types.ResultListNames, error)
}
@@ -94,14 +95,14 @@ type Transactor interface {
CallCode(fromAddress, code, data []byte) (*types.Call, error)
// Send(privKey, toAddress []byte, amount int64) (*types.Receipt, error)
// SendAndHold(privKey, toAddress []byte, amount int64) (*types.Receipt, error)
- BroadcastTx(tx transactions.Tx) (*types.Receipt, error)
+ BroadcastTx(tx transaction.Tx) (*types.Receipt, error)
Transact(privKey, address, data []byte, gasLimit,
fee int64) (*types.Receipt, error)
TransactAndHold(privKey, address, data []byte, gasLimit,
- fee int64) (*transactions.EventDataCall, error)
+ fee int64) (*transaction.EventDataCall, error)
TransactNameReg(privKey []byte, name, data string, amount,
fee int64) (*types.Receipt, error)
UnconfirmedTxs() (*types.UnconfirmedTxs, error)
- SignTx(tx transactions.Tx,
- privAccounts []*types.PrivAccount) (transactions.Tx, error)
+ SignTx(tx transaction.Tx,
+ privAccounts []*account.PrivAccount) (transaction.Tx, error)
}
diff --git a/core/types/account.go b/core/types/account.go
deleted file mode 100644
index 7e836559..00000000
--- a/core/types/account.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015, 2016 Eris Industries (UK) Ltd.
-// This file is part of Eris-RT
-
-// Eris-RT is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Eris-RT is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Eris-RT. If not, see <http://www.gnu.org/licenses/>.
-
-// TODO: [ben] Account and PrivateAccount need to become a pure interface
-// and then move the implementation to the manager types.
-// Eg, Geth has its accounts, different from ErisMint
-
-package types
-
-import (
- "bytes"
- "fmt"
- "io"
-
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- . "github.com/tendermint/go-common"
- "github.com/tendermint/go-crypto"
- "github.com/tendermint/go-merkle"
- "github.com/tendermint/go-wire"
-)
-
-// Signable is an interface for all signable things.
-// It typically removes signatures before serializing.
-type Signable interface {
- WriteSignBytes(chainID string, w io.Writer, n *int, err *error)
- // SignBytes is a convenience method for getting the bytes to sign of a Signable.
- SignBytes(chainID string, o Signable) []byte
-}
-
-// SignBytes is a convenience method for getting the bytes to sign of a Signable.
-func SignBytes(chainID string, o Signable) []byte {
- buf, n, err := new(bytes.Buffer), new(int), new(error)
- o.WriteSignBytes(chainID, buf, n, err)
- if *err != nil {
- PanicCrisis(err)
- }
- return buf.Bytes()
-}
-
-// HashSignBytes is a convenience method for getting the hash of the bytes of a signable
-func HashSignBytes(chainID string, o Signable) []byte {
- return merkle.SimpleHashFromBinary(SignBytes(chainID, o))
-}
-
-//-----------------------------------------------------------------------------
-
-// Account resides in the application state, and is mutated by transactions
-// on the blockchain.
-// Serialized by wire.[read|write]Reflect
-type Account struct {
- Address []byte `json:"address"`
- PubKey crypto.PubKey `json:"pub_key"`
- Sequence int `json:"sequence"`
- Balance int64 `json:"balance"`
- Code []byte `json:"code"` // VM code
- StorageRoot []byte `json:"storage_root"` // VM storage merkle root.
-
- Permissions ptypes.AccountPermissions `json:"permissions"`
-}
-
-func (acc *Account) Copy() *Account {
- accCopy := *acc
- return &accCopy
-}
-
-func (acc *Account) String() string {
- if acc == nil {
- return "nil-Account"
- }
- return fmt.Sprintf("Account{%X:%v B:%v C:%v S:%X P:%s}", acc.Address, acc.PubKey, acc.Balance, len(acc.Code), acc.StorageRoot, acc.Permissions)
-}
-
-func AccountEncoder(o interface{}, w io.Writer, n *int, err *error) {
- wire.WriteBinary(o.(*Account), w, n, err)
-}
-
-func AccountDecoder(r io.Reader, n *int, err *error) interface{} {
- return wire.ReadBinary(&Account{}, r, 0, n, err)
-}
-
-var AccountCodec = wire.Codec{
- Encode: AccountEncoder,
- Decode: AccountDecoder,
-}
-
-func EncodeAccount(acc *Account) []byte {
- w := new(bytes.Buffer)
- var n int
- var err error
- AccountEncoder(acc, w, &n, &err)
- return w.Bytes()
-}
-
-func DecodeAccount(accBytes []byte) *Account {
- var n int
- var err error
- acc := AccountDecoder(bytes.NewBuffer(accBytes), &n, &err)
- return acc.(*Account)
-}
diff --git a/core/types/priv_account.go b/core/types/priv_account.go
deleted file mode 100644
index 77c40215..00000000
--- a/core/types/priv_account.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015, 2016 Eris Industries (UK) Ltd.
-// This file is part of Eris-RT
-
-// Eris-RT is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Eris-RT is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Eris-RT. If not, see <http://www.gnu.org/licenses/>.
-
-// TODO: [ben] Account and PrivateAccount need to become a pure interface
-// and then move the implementation to the manager types.
-// Eg, Geth has its accounts, different from ErisMint
-
-package types
-
-import (
- "github.com/tendermint/ed25519"
- . "github.com/tendermint/go-common"
- "github.com/tendermint/go-crypto"
- "github.com/tendermint/go-wire"
-)
-
-type PrivAccount struct {
- Address []byte `json:"address"`
- PubKey crypto.PubKey `json:"pub_key"`
- PrivKey crypto.PrivKey `json:"priv_key"`
-}
-
-func (pA *PrivAccount) Generate(index int) *PrivAccount {
- newPrivKey := pA.PrivKey.(crypto.PrivKeyEd25519).Generate(index)
- newPubKey := newPrivKey.PubKey()
- newAddress := newPubKey.Address()
- return &PrivAccount{
- Address: newAddress,
- PubKey: newPubKey,
- PrivKey: newPrivKey,
- }
-}
-
-func (pA *PrivAccount) Sign(chainID string, o Signable) crypto.Signature {
- return pA.PrivKey.Sign(SignBytes(chainID, o))
-}
-
-func (pA *PrivAccount) String() string {
- return Fmt("PrivAccount{%X}", pA.Address)
-}
-
-//----------------------------------------
-
-// Generates a new account with private key.
-func GenPrivAccount() *PrivAccount {
- privKeyBytes := new([64]byte)
- copy(privKeyBytes[:32], crypto.CRandBytes(32))
- pubKeyBytes := ed25519.MakePublicKey(privKeyBytes)
- pubKey := crypto.PubKeyEd25519(*pubKeyBytes)
- privKey := crypto.PrivKeyEd25519(*privKeyBytes)
- return &PrivAccount{
- Address: pubKey.Address(),
- PubKey: pubKey,
- PrivKey: privKey,
- }
-}
-
-// Generates 32 priv key bytes from secret
-func GenPrivKeyBytesFromSecret(secret string) []byte {
- return wire.BinarySha256(secret) // Not Ripemd160 because we want 32 bytes.
-}
-
-// Generates a new account with private key from SHA256 hash of a secret
-func GenPrivAccountFromSecret(secret string) *PrivAccount {
- privKey32 := GenPrivKeyBytesFromSecret(secret)
- privKeyBytes := new([64]byte)
- copy(privKeyBytes[:32], privKey32)
- pubKeyBytes := ed25519.MakePublicKey(privKeyBytes)
- pubKey := crypto.PubKeyEd25519(*pubKeyBytes)
- privKey := crypto.PrivKeyEd25519(*privKeyBytes)
- return &PrivAccount{
- Address: pubKey.Address(),
- PubKey: pubKey,
- PrivKey: privKey,
- }
-}
-
-func GenPrivAccountFromPrivKeyBytes(privKeyBytes []byte) *PrivAccount {
- if len(privKeyBytes) != 64 {
- PanicSanity(Fmt("Expected 64 bytes but got %v", len(privKeyBytes)))
- }
- var privKeyArray [64]byte
- copy(privKeyArray[:], privKeyBytes)
- pubKeyBytes := ed25519.MakePublicKey(&privKeyArray)
- pubKey := crypto.PubKeyEd25519(*pubKeyBytes)
- privKey := crypto.PrivKeyEd25519(privKeyArray)
- return &PrivAccount{
- Address: pubKey.Address(),
- PubKey: pubKey,
- PrivKey: privKey,
- }
-}
diff --git a/core/types/types.go b/core/types/types.go
index 1a36fd0e..9c463920 100644
--- a/core/types/types.go
+++ b/core/types/types.go
@@ -20,11 +20,12 @@
package types
import (
- transactions "github.com/eris-ltd/eris-db/txs"
-
"github.com/tendermint/go-p2p" // NodeInfo (drop this!)
csus "github.com/tendermint/tendermint/consensus"
"github.com/tendermint/tendermint/types"
+
+ account "github.com/eris-ltd/eris-db/account"
+ transaction "github.com/eris-ltd/eris-db/txs"
)
type (
@@ -33,7 +34,7 @@ type (
// Accounts
AccountList struct {
- Accounts []*Account `json:"accounts"`
+ Accounts []*account.Account `json:"accounts"`
}
// A contract account storage item.
@@ -160,7 +161,7 @@ type (
// UnconfirmedTxs
UnconfirmedTxs struct {
- Txs []transactions.Tx `json:"txs"`
+ Txs []transaction.Tx `json:"txs"`
}
// BroadcastTx or Transact
@@ -192,5 +193,5 @@ func FromRoundState(rs *csus.RoundState) *ConsensusState {
type ResultListNames struct {
BlockHeight int `json:"block_height"`
- Names []*transactions.NameRegEntry `json:"names"`
+ Names []*transaction.NameRegEntry `json:"names"`
}
diff --git a/erisdb/params.go b/erisdb/params.go
index 4abac581..7c68fe2f 100644
--- a/erisdb/params.go
+++ b/erisdb/params.go
@@ -1,7 +1,7 @@
package erisdb
import (
- "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/erisdb/pipe"
"github.com/eris-ltd/eris-db/txs"
)
diff --git a/erisdb/pipe/accounts.go b/erisdb/pipe/accounts.go
index 138a13a7..c7ca7857 100644
--- a/erisdb/pipe/accounts.go
+++ b/erisdb/pipe/accounts.go
@@ -6,7 +6,7 @@ import (
"fmt"
"sync"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
cmn "github.com/tendermint/go-common"
"github.com/eris-ltd/eris-db/tmsp"
diff --git a/erisdb/pipe/pipe.go b/erisdb/pipe/pipe.go
index 160b3e29..b13380e6 100644
--- a/erisdb/pipe/pipe.go
+++ b/erisdb/pipe/pipe.go
@@ -5,7 +5,7 @@ import (
em "github.com/tendermint/go-events"
"github.com/tendermint/tendermint/types"
- "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/tmsp"
txs "github.com/eris-ltd/eris-db/txs"
)
diff --git a/erisdb/pipe/transactor.go b/erisdb/pipe/transactor.go
index 92cdccfc..289dc430 100644
--- a/erisdb/pipe/transactor.go
+++ b/erisdb/pipe/transactor.go
@@ -7,7 +7,7 @@ import (
"sync"
"time"
- "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
"github.com/eris-ltd/eris-db/manager/eris-mint/state"
"github.com/eris-ltd/eris-db/txs"
diff --git a/erisdb/pipe/types.go b/erisdb/pipe/types.go
index a0261449..d8e6be8e 100644
--- a/erisdb/pipe/types.go
+++ b/erisdb/pipe/types.go
@@ -1,7 +1,7 @@
package pipe
import (
- "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ "github.com/eris-ltd/eris-db/account"
txs "github.com/eris-ltd/eris-db/txs"
"github.com/tendermint/go-p2p" // NodeInfo (drop this!)
diff --git a/manager/eris-mint/state/block_cache.go b/manager/eris-mint/state/block_cache.go
index 92f8d7cb..1cefa6a3 100644
--- a/manager/eris-mint/state/block_cache.go
+++ b/manager/eris-mint/state/block_cache.go
@@ -8,7 +8,7 @@ import (
dbm "github.com/tendermint/go-db"
"github.com/tendermint/go-merkle"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/txs"
)
diff --git a/manager/eris-mint/state/common.go b/manager/eris-mint/state/common.go
index 6309a87f..0ea74ab8 100644
--- a/manager/eris-mint/state/common.go
+++ b/manager/eris-mint/state/common.go
@@ -2,7 +2,7 @@ package state
import (
. "github.com/tendermint/go-common"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
)
diff --git a/manager/eris-mint/state/execution.go b/manager/eris-mint/state/execution.go
index 6320acd3..252fce6e 100644
--- a/manager/eris-mint/state/execution.go
+++ b/manager/eris-mint/state/execution.go
@@ -8,7 +8,7 @@ import (
. "github.com/tendermint/go-common"
"github.com/tendermint/go-events"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
ptypes "github.com/eris-ltd/eris-db/permission/types" // for GlobalPermissionAddress ...
diff --git a/manager/eris-mint/state/genesis_test.go b/manager/eris-mint/state/genesis_test.go
index fba281c3..ac50ef21 100644
--- a/manager/eris-mint/state/genesis_test.go
+++ b/manager/eris-mint/state/genesis_test.go
@@ -8,7 +8,7 @@ import (
"testing"
"time"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
ptypes "github.com/eris-ltd/eris-db/permission/types"
. "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
diff --git a/manager/eris-mint/state/permissions_test.go b/manager/eris-mint/state/permissions_test.go
index 3331a4f7..d511d91b 100644
--- a/manager/eris-mint/state/permissions_test.go
+++ b/manager/eris-mint/state/permissions_test.go
@@ -8,7 +8,7 @@ import (
"testing"
"time"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
ptypes "github.com/eris-ltd/eris-db/permission/types"
. "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
diff --git a/manager/eris-mint/state/state.go b/manager/eris-mint/state/state.go
index 2051fa32..a3937a5c 100644
--- a/manager/eris-mint/state/state.go
+++ b/manager/eris-mint/state/state.go
@@ -6,7 +6,7 @@ import (
"io/ioutil"
"time"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
ptypes "github.com/eris-ltd/eris-db/permission/types"
. "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
txs "github.com/eris-ltd/eris-db/txs"
diff --git a/manager/eris-mint/state/tx_cache.go b/manager/eris-mint/state/tx_cache.go
index 18eca782..265e4c63 100644
--- a/manager/eris-mint/state/tx_cache.go
+++ b/manager/eris-mint/state/tx_cache.go
@@ -1,7 +1,7 @@
package state
import (
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
ptypes "github.com/eris-ltd/eris-db/permission/types" // for GlobalPermissionAddress ...
"github.com/eris-ltd/eris-db/txs"
diff --git a/rpc/client/client.go b/rpc/client/client.go
index 1778bf36..01b57512 100644
--- a/rpc/client/client.go
+++ b/rpc/client/client.go
@@ -3,7 +3,7 @@ package client
import (
rpcclient "github.com/tendermint/go-rpc/client"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
"github.com/eris-ltd/eris-db/txs"
)
diff --git a/rpc/core/accounts.go b/rpc/core/accounts.go
index 07ca8754..ca236cfb 100644
--- a/rpc/core/accounts.go
+++ b/rpc/core/accounts.go
@@ -2,7 +2,7 @@ package core
import (
"fmt"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
. "github.com/tendermint/go-common"
)
diff --git a/rpc/core/routes.go b/rpc/core/routes.go
index 218d4b19..cb527569 100644
--- a/rpc/core/routes.go
+++ b/rpc/core/routes.go
@@ -1,7 +1,7 @@
package core
import (
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
"github.com/eris-ltd/eris-db/txs"
rpc "github.com/tendermint/go-rpc/server"
diff --git a/rpc/core/txs.go b/rpc/core/txs.go
index 414fe138..527c2111 100644
--- a/rpc/core/txs.go
+++ b/rpc/core/txs.go
@@ -3,7 +3,7 @@ package core
import (
"fmt"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
"github.com/eris-ltd/eris-db/manager/eris-mint/state"
diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go
index 6a544e00..4f9a00fa 100644
--- a/rpc/core/types/responses.go
+++ b/rpc/core/types/responses.go
@@ -1,7 +1,7 @@
package core_types
import (
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
txtypes "github.com/eris-ltd/eris-db/txs"
"github.com/tendermint/tendermint/types"
diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go
index 50190c32..2dfb07af 100644
--- a/rpc/test/helpers.go
+++ b/rpc/test/helpers.go
@@ -5,7 +5,7 @@ import (
"strconv"
"testing"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
edb "github.com/eris-ltd/eris-db/erisdb"
edbcli "github.com/eris-ltd/eris-db/rpc/client"
ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
diff --git a/test/mock/mock_web_api_test.go b/test/mock/mock_web_api_test.go
index b1ecb828..a621833d 100644
--- a/test/mock/mock_web_api_test.go
+++ b/test/mock/mock_web_api_test.go
@@ -10,7 +10,7 @@ import (
"testing"
// edb "github.com/eris-ltd/erisdb/erisdb"
- "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/config"
edb "github.com/eris-ltd/eris-db/erisdb"
ep "github.com/eris-ltd/eris-db/erisdb/pipe"
diff --git a/test/mock/pipe.go b/test/mock/pipe.go
index 7dd3bbc2..dfc032a4 100644
--- a/test/mock/pipe.go
+++ b/test/mock/pipe.go
@@ -1,7 +1,7 @@
package mock
import (
- "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ "github.com/eris-ltd/eris-db/account"
ep "github.com/eris-ltd/eris-db/erisdb/pipe"
td "github.com/eris-ltd/eris-db/test/testdata/testdata"
types "github.com/eris-ltd/eris-db/txs"
diff --git a/test/testdata/testdata/testdata.go b/test/testdata/testdata/testdata.go
index b706422f..d90b0596 100644
--- a/test/testdata/testdata/testdata.go
+++ b/test/testdata/testdata/testdata.go
@@ -1,7 +1,7 @@
package testdata
import (
- "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ "github.com/eris-ltd/eris-db/account"
edb "github.com/eris-ltd/eris-db/erisdb"
ep "github.com/eris-ltd/eris-db/erisdb/pipe"
stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
diff --git a/test/web_api/web_api_test.go b/test/web_api/web_api_test.go
index c5d6ccb1..c1eaf57c 100644
--- a/test/web_api/web_api_test.go
+++ b/test/web_api/web_api_test.go
@@ -12,7 +12,7 @@ import (
"path"
"testing"
- "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ "github.com/eris-ltd/eris-db/account"
"github.com/eris-ltd/eris-db/config"
edb "github.com/eris-ltd/eris-db/erisdb"
ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"
diff --git a/txs/tx.go b/txs/tx.go
index 51bd94e9..a67eea42 100644
--- a/txs/tx.go
+++ b/txs/tx.go
@@ -8,7 +8,7 @@ import (
"golang.org/x/crypto/ripemd160"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
ptypes "github.com/eris-ltd/eris-db/permission/types"
. "github.com/tendermint/go-common"
"github.com/tendermint/go-wire"
diff --git a/txs/tx_test.go b/txs/tx_test.go
index 69a5bc6d..5a73d351 100644
--- a/txs/tx_test.go
+++ b/txs/tx_test.go
@@ -3,7 +3,7 @@ package txs
import (
"testing"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
ptypes "github.com/eris-ltd/eris-db/permission/types"
. "github.com/tendermint/go-common"
diff --git a/txs/tx_utils.go b/txs/tx_utils.go
index e600af1c..e6979510 100644
--- a/txs/tx_utils.go
+++ b/txs/tx_utils.go
@@ -2,7 +2,7 @@ package txs
import (
"fmt"
- acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+ acm "github.com/eris-ltd/eris-db/account"
ptypes "github.com/eris-ltd/eris-db/permission/types"
"github.com/tendermint/go-crypto"
--
GitLab