From a86303bc6e79fa385bc862ac8b3f7d32d2fd1319 Mon Sep 17 00:00:00 2001 From: Benjamin Bollen <ben@erisindustries.com> Date: Fri, 27 May 2016 20:04:11 +0200 Subject: [PATCH] move rpc dependencies on evm, state and account to manager/erismint --- rpc/client/client.go | 2 +- rpc/core/accounts.go | 2 +- rpc/core/names.go | 2 +- rpc/core/net.go | 2 +- rpc/core/pipe.go | 2 +- rpc/core/routes.go | 2 +- rpc/core/txs.go | 6 +++--- rpc/core/types/responses.go | 4 ++-- rpc/test/helpers.go | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rpc/client/client.go b/rpc/client/client.go index 01b57512..1778bf36 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/account" + acm "github.com/eris-ltd/eris-db/manager/eris-mint/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 ca236cfb..07ca8754 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/account" + acm "github.com/eris-ltd/eris-db/manager/eris-mint/account" ctypes "github.com/eris-ltd/eris-db/rpc/core/types" . "github.com/tendermint/go-common" ) diff --git a/rpc/core/names.go b/rpc/core/names.go index 063f0703..8de2243e 100644 --- a/rpc/core/names.go +++ b/rpc/core/names.go @@ -4,7 +4,7 @@ import ( "fmt" ctypes "github.com/eris-ltd/eris-db/rpc/core/types" - 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/txs" ) diff --git a/rpc/core/net.go b/rpc/core/net.go index 2198731c..7d156af0 100644 --- a/rpc/core/net.go +++ b/rpc/core/net.go @@ -2,7 +2,7 @@ package core import ( ctypes "github.com/eris-ltd/eris-db/rpc/core/types" - sm "github.com/eris-ltd/eris-db/state" + sm "github.com/eris-ltd/eris-db/manager/eris-mint/state" "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/go-db" diff --git a/rpc/core/pipe.go b/rpc/core/pipe.go index 23860a03..43f21460 100644 --- a/rpc/core/pipe.go +++ b/rpc/core/pipe.go @@ -1,7 +1,7 @@ package core import ( - stypes "github.com/eris-ltd/eris-db/state/types" + stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types" "github.com/eris-ltd/eris-db/tmsp" bc "github.com/tendermint/tendermint/blockchain" diff --git a/rpc/core/routes.go b/rpc/core/routes.go index cb527569..218d4b19 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/account" + acm "github.com/eris-ltd/eris-db/manager/eris-mint/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 2029ce01..414fe138 100644 --- a/rpc/core/txs.go +++ b/rpc/core/txs.go @@ -3,10 +3,10 @@ package core import ( "fmt" - acm "github.com/eris-ltd/eris-db/account" - "github.com/eris-ltd/eris-db/evm" + acm "github.com/eris-ltd/eris-db/manager/eris-mint/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/state" + "github.com/eris-ltd/eris-db/manager/eris-mint/state" "github.com/eris-ltd/eris-db/txs" . "github.com/tendermint/go-common" diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go index d8a9a61b..6a544e00 100644 --- a/rpc/core/types/responses.go +++ b/rpc/core/types/responses.go @@ -1,8 +1,8 @@ package core_types import ( - acm "github.com/eris-ltd/eris-db/account" - stypes "github.com/eris-ltd/eris-db/state/types" + acm "github.com/eris-ltd/eris-db/manager/eris-mint/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 98affbda..50190c32 100644 --- a/rpc/test/helpers.go +++ b/rpc/test/helpers.go @@ -5,12 +5,12 @@ import ( "strconv" "testing" - acm "github.com/eris-ltd/eris-db/account" + acm "github.com/eris-ltd/eris-db/manager/eris-mint/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" - 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" txs "github.com/eris-ltd/eris-db/txs" -- GitLab