diff --git a/core/pipe.go b/core/pipe.go index 4414c9e39308f8eb149fc304b4ff78eacb2f6451..ebd0b272e235c411c3cd7ba3949b0a199615defa 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 7e836559cd37a2c47c049ebba081b250e83da4d6..0000000000000000000000000000000000000000 --- 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 77c4021558941d186bf8248da9593b541bccd1e1..0000000000000000000000000000000000000000 --- 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 1a36fd0e1ce480f92b1dcfae3bb332e84bf1ada2..9c463920ac0d3d439e383db4f364e3f728106dab 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 4abac581a10e572274c7f6858cd575e170f14b60..7c68fe2f6cf74bb76a335354b501436816b5843c 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 138a13a7779e42fea490d64cf2e22a628565ecc6..c7ca785701157d31c2aebfd89cb0d2cb574589bb 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 160b3e2947a31e8fb7ed1c44a6c68ae2fc97b3fd..b13380e6b2e63396620a19c77376ab46d3f1ef88 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 92cdccfc2af4efd10a3d27b0961b8f6a04f710f8..289dc430f30aa897e59dc98a07b4c08000c767ea 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 a0261449a4769578e10be35e9c1ea02164751868..d8e6be8e46f859951688d9fd32eb915bc7dd6613 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 92f8d7cbab50de53b282fbf54ea553aafaa1788d..1cefa6a3b18b996800a2d89e0670675ee14dd1d2 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 6309a87f1383a713cea495c0c2019b9ae9fabf13..0ea74ab8a17911f2a925566bb0529c6911f7b237 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 6320acd3cff891c12aec870f50da6a00d5b90fcc..252fce6efe40d45638bf216e1cda69fc73b0c290 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 fba281c37e3ff49e1e5ad59ea1b2071998729de0..ac50ef21e90e9f29f7bc2f66a2d7950fc4540a1b 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 3331a4f7f7c04b99f9cc996943e023a51f9ff6b3..d511d91bd631e93aced268482cc17454dfdd6c85 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 2051fa327dae060e025efb3557d27901754964c9..a3937a5c302b73cae7f257368b077e20f96915ea 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 18eca782c4a8faba1bc243a8c45449cdfc45fdb0..265e4c63b3b4c71d8c74a20622cf28f36159c377 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 1778bf36bd27ce9b7a8d615c2920fbfb151de7eb..01b57512cf4327b7d51ef2127fa9727bce079a9f 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 07ca8754f461b2d9c4794364bf4fb0ec037b33df..ca236cfb9bbe977e78dddf9a3b1c1650961c9632 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 218d4b19e5668b6edb68cda51c4b1de77947db1a..cb52756937e4082eace6feac630fea7a6401ced0 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 414fe1383ccd6aef705abb06a6de468cfd5d37ac..527c21112dcd8c6fed3cc3dcb77b442bb0e9ebd5 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 6a544e004d0e1e398a90b303ac8b70ecdb6841f7..4f9a00faf85a417f7b7a1d568f135f5cfd7813d2 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 50190c324cfc8e588d2cf5a7e0b404ec1a3497e8..2dfb07afe3f219ceac56f8f410f7977caf0f5e39 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 b1ecb828a6978e71742a43c7ad560b6809d897ee..a621833db95d13571218c9dafab192debc428004 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 7dd3bbc29a06852d9381888fb9ccb1ccb652afa7..dfc032a4c0e478dacb7ffeb01d46078a3f7b3e91 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 b706422f2b5832880faa65a5c68c6d1b248ce0bc..d90b0596e40ca1e4855842102e7f9a236e5e6637 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 c5d6ccb1fd669f3bfab8b5bde6c176e3a3845466..c1eaf57c3ff7fbff65bd16b6faa6d0230dc747cc 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 51bd94e93238f0bdb5456278ac2957e19930c0a5..a67eea42827d121c6d00e6ef46290a4c8f2ecf5e 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 69a5bc6dff2a2e2c62171a1c3b4c8791ec87b9eb..5a73d351cab29b7fefc51c425e6f385a05abf3aa 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 e600af1c6d0a6cf8d11a7073cae31efecf9bd5b8..e697951091cfd0b0ce58c748b7e6bdb5c4aef5b9 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"