From 519929e4bd0ca4024afb8aac0f294978e819d3d9 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Wed, 22 Jun 2016 16:04:21 +0100
Subject: [PATCH] fix tests for move /rpc/tendermint in tests
---
cmd/serve.go | 2 +-
core/core.go | 2 +-
rpc/tendermint/client/client.go | 2 +-
rpc/tendermint/core/accounts.go | 2 +-
rpc/tendermint/core/mempool.go | 2 +-
rpc/tendermint/core/names.go | 2 +-
rpc/tendermint/core/net.go | 2 +-
rpc/tendermint/core/routes.go | 2 +-
rpc/tendermint/core/txs.go | 2 +-
rpc/tendermint/test/helpers.go | 8 ++++----
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cmd/serve.go b/cmd/serve.go
index c0edf725..0f560031 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -135,7 +135,7 @@ func Serve(cmd *cobra.Command, args []string) {
log.Fatalf("Failed to load server configuration: %s.", err)
os.Exit(1)
}
- serverProcess, err := newCore.NewGateway(serverConfig)
+ serverProcess, err := newCore.NewGatewayV0(serverConfig)
if err != nil {
log.Fatalf("Failed to load servers: %s.", err)
os.Exit(1)
diff --git a/core/core.go b/core/core.go
index 43d0bb3a..f71559be 100644
--- a/core/core.go
+++ b/core/core.go
@@ -78,7 +78,7 @@ func NewCore(chainId string, consensusConfig *config.ModuleConfig,
// NOTE: [ben] in phase 0 we exactly take over the full server architecture
// from Eris-DB and Tendermint; This is a draft and will be overhauled.
-func (core *Core) NewGateway(config *server.ServerConfig) (*server.ServeProcess,
+func (core *Core) NewGatewayV0(config *server.ServerConfig) (*server.ServeProcess,
error) {
codec := &rpc_v0.TCodec{}
eventSubscriptions := event.NewEventSubscriptions(core.pipe.Events())
diff --git a/rpc/tendermint/client/client.go b/rpc/tendermint/client/client.go
index 01b57512..a8efbc20 100644
--- a/rpc/tendermint/client/client.go
+++ b/rpc/tendermint/client/client.go
@@ -4,7 +4,7 @@ import (
rpcclient "github.com/tendermint/go-rpc/client"
acm "github.com/eris-ltd/eris-db/account"
- ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+ ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
"github.com/eris-ltd/eris-db/txs"
)
diff --git a/rpc/tendermint/core/accounts.go b/rpc/tendermint/core/accounts.go
index c2ebfa11..86d99f8a 100644
--- a/rpc/tendermint/core/accounts.go
+++ b/rpc/tendermint/core/accounts.go
@@ -4,7 +4,7 @@ import (
"fmt"
acm "github.com/eris-ltd/eris-db/account"
- ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+ ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
. "github.com/tendermint/go-common"
)
diff --git a/rpc/tendermint/core/mempool.go b/rpc/tendermint/core/mempool.go
index 39e1b8f6..78afb712 100644
--- a/rpc/tendermint/core/mempool.go
+++ b/rpc/tendermint/core/mempool.go
@@ -3,7 +3,7 @@ package core
import (
"fmt"
- ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+ ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
txs "github.com/eris-ltd/eris-db/txs"
"github.com/tendermint/tendermint/types"
tmsp "github.com/tendermint/tmsp/types"
diff --git a/rpc/tendermint/core/names.go b/rpc/tendermint/core/names.go
index d87a1980..2842feda 100644
--- a/rpc/tendermint/core/names.go
+++ b/rpc/tendermint/core/names.go
@@ -3,7 +3,7 @@ package core
import (
"fmt"
- ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+ ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
"github.com/eris-ltd/eris-db/txs"
)
diff --git a/rpc/tendermint/core/net.go b/rpc/tendermint/core/net.go
index 7d156af0..ae06c603 100644
--- a/rpc/tendermint/core/net.go
+++ b/rpc/tendermint/core/net.go
@@ -1,7 +1,7 @@
package core
import (
- ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+ ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
"github.com/tendermint/tendermint/types"
diff --git a/rpc/tendermint/core/routes.go b/rpc/tendermint/core/routes.go
index cb527569..15b21125 100644
--- a/rpc/tendermint/core/routes.go
+++ b/rpc/tendermint/core/routes.go
@@ -2,7 +2,7 @@ package core
import (
acm "github.com/eris-ltd/eris-db/account"
- ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+ ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
"github.com/eris-ltd/eris-db/txs"
rpc "github.com/tendermint/go-rpc/server"
)
diff --git a/rpc/tendermint/core/txs.go b/rpc/tendermint/core/txs.go
index c3fe2fb4..ab9ed784 100644
--- a/rpc/tendermint/core/txs.go
+++ b/rpc/tendermint/core/txs.go
@@ -5,7 +5,7 @@ import (
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"
+ ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
"github.com/eris-ltd/eris-db/manager/eris-mint/state"
"github.com/eris-ltd/eris-db/txs"
diff --git a/rpc/tendermint/test/helpers.go b/rpc/tendermint/test/helpers.go
index 11647e64..2f7489ae 100644
--- a/rpc/tendermint/test/helpers.go
+++ b/rpc/tendermint/test/helpers.go
@@ -6,16 +6,16 @@ import (
"testing"
acm "github.com/eris-ltd/eris-db/account"
+ "github.com/eris-ltd/eris-db/server"
edb "github.com/eris-ltd/eris-db/core"
erismint "github.com/eris-ltd/eris-db/manager/eris-mint"
sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
- edbcli "github.com/eris-ltd/eris-db/rpc/client"
- ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+ edbcli "github.com/eris-ltd/eris-db/rpc/tendermint/client"
+ ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
txs "github.com/eris-ltd/eris-db/txs"
. "github.com/tendermint/go-common"
- cfg "github.com/tendermint/go-config"
"github.com/tendermint/go-crypto"
dbm "github.com/tendermint/go-db"
"github.com/tendermint/go-events"
@@ -30,7 +30,7 @@ import (
// global variables for use across all tests
var (
- config cfg.Config
+ config server.ServerConfig
node *nm.Node
mempoolCount = 0
chainID string
--
GitLab