From 14e465d67a86042af03125051c1318dea30f4173 Mon Sep 17 00:00:00 2001 From: Benjamin Bollen <ben@erisindustries.com> Date: Fri, 27 May 2016 20:03:25 +0200 Subject: [PATCH] move dependencies of erisdb/ on evm, state and account to manager/erismint --- erisdb/erisdbss/http.go | 2 +- erisdb/params.go | 2 +- erisdb/pipe/accounts.go | 2 +- erisdb/pipe/blockchain.go | 2 +- erisdb/pipe/namereg.go | 2 +- erisdb/pipe/pipe.go | 2 +- erisdb/pipe/transactor.go | 6 +++--- erisdb/pipe/types.go | 2 +- erisdb/serve.go | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/erisdb/erisdbss/http.go b/erisdb/erisdbss/http.go index d01865ea..f738e9b5 100644 --- a/erisdb/erisdbss/http.go +++ b/erisdb/erisdbss/http.go @@ -7,7 +7,7 @@ import ( "os" "github.com/eris-ltd/eris-db/config" - stypes "github.com/eris-ltd/eris-db/state/types" + stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types" "github.com/gin-gonic/gin" . "github.com/tendermint/go-common" "github.com/tendermint/go-wire" diff --git a/erisdb/params.go b/erisdb/params.go index 7c68fe2f..4abac581 100644 --- a/erisdb/params.go +++ b/erisdb/params.go @@ -1,7 +1,7 @@ package erisdb import ( - "github.com/eris-ltd/eris-db/account" + "github.com/eris-ltd/eris-db/manager/eris-mint/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 c7ca7857..138a13a7 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/account" + acm "github.com/eris-ltd/eris-db/manager/eris-mint/account" cmn "github.com/tendermint/go-common" "github.com/eris-ltd/eris-db/tmsp" diff --git a/erisdb/pipe/blockchain.go b/erisdb/pipe/blockchain.go index 9a4d05a5..da379df6 100644 --- a/erisdb/pipe/blockchain.go +++ b/erisdb/pipe/blockchain.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/eris-ltd/eris-db/state" + "github.com/eris-ltd/eris-db/manager/eris-mint/state" dbm "github.com/tendermint/go-db" "github.com/tendermint/tendermint/types" ) diff --git a/erisdb/pipe/namereg.go b/erisdb/pipe/namereg.go index 87cf1d27..fce9f79e 100644 --- a/erisdb/pipe/namereg.go +++ b/erisdb/pipe/namereg.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - sm "github.com/eris-ltd/eris-db/state" + sm "github.com/eris-ltd/eris-db/manager/eris-mint/state" "github.com/eris-ltd/eris-db/tmsp" "github.com/eris-ltd/eris-db/txs" ) diff --git a/erisdb/pipe/pipe.go b/erisdb/pipe/pipe.go index b13380e6..160b3e29 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/account" + "github.com/eris-ltd/eris-db/manager/eris-mint/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 8ae73ef4..92cdccfc 100644 --- a/erisdb/pipe/transactor.go +++ b/erisdb/pipe/transactor.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/eris-ltd/eris-db/account" - "github.com/eris-ltd/eris-db/evm" - "github.com/eris-ltd/eris-db/state" + "github.com/eris-ltd/eris-db/manager/eris-mint/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" cmn "github.com/tendermint/go-common" diff --git a/erisdb/pipe/types.go b/erisdb/pipe/types.go index d8e6be8e..a0261449 100644 --- a/erisdb/pipe/types.go +++ b/erisdb/pipe/types.go @@ -1,7 +1,7 @@ package pipe import ( - "github.com/eris-ltd/eris-db/account" + "github.com/eris-ltd/eris-db/manager/eris-mint/account" txs "github.com/eris-ltd/eris-db/txs" "github.com/tendermint/go-p2p" // NodeInfo (drop this!) diff --git a/erisdb/serve.go b/erisdb/serve.go index 8f8a8c36..f79b73e9 100644 --- a/erisdb/serve.go +++ b/erisdb/serve.go @@ -35,8 +35,8 @@ import ( ep "github.com/eris-ltd/eris-db/erisdb/pipe" rpccore "github.com/eris-ltd/eris-db/rpc/core" "github.com/eris-ltd/eris-db/server" - sm "github.com/eris-ltd/eris-db/state" - stypes "github.com/eris-ltd/eris-db/state/types" + sm "github.com/eris-ltd/eris-db/manager/eris-mint/state" + stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types" edbapp "github.com/eris-ltd/eris-db/tmsp" tmcfg "github.com/tendermint/tendermint/config/tendermint" // for inproc only! -- GitLab