From 19b5cbccf434e069f9ffb8a70b742b2b222ee9a2 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Wed, 22 Jun 2016 18:09:53 +0100
Subject: [PATCH] helpers done help
---
core/core.go | 4 ++--
rpc/tendermint/test/helpers.go | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/core/core.go b/core/core.go
index 3ff05bea..771362fe 100644
--- a/core/core.go
+++ b/core/core.go
@@ -30,12 +30,12 @@ import (
definitions "github.com/eris-ltd/eris-db/definitions"
event "github.com/eris-ltd/eris-db/event"
manager "github.com/eris-ltd/eris-db/manager"
- erismint "github.com/eris-ltd/eris-db/manager/eris-mint"
- rpccore "github.com/eris-ltd/eris-db/rpc/tendermint/core"
// rpc_v0 is carried over from Eris-DBv0.11 and before on port 1337
rpc_v0 "github.com/eris-ltd/eris-db/rpc/v0"
+ rpccore "github.com/eris-ltd/eris-db/rpc/tendermint/core"
// rpc_tendermint is carried over from Eris-DBv0.11 and before on port 46657
// rpc_tendermint "github.com/eris-ltd/eris-db/rpc/tendermint"
+ "github.com/eris-ltd/eris-db/manager/eris-mint"
server "github.com/eris-ltd/eris-db/server"
"github.com/tendermint/go-rpc/server"
"github.com/tendermint/tendermint/node"
diff --git a/rpc/tendermint/test/helpers.go b/rpc/tendermint/test/helpers.go
index 2f7489ae..07b77cd4 100644
--- a/rpc/tendermint/test/helpers.go
+++ b/rpc/tendermint/test/helpers.go
@@ -6,7 +6,6 @@ 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"
@@ -23,14 +22,16 @@ import (
rpcclient "github.com/tendermint/go-rpc/client"
"github.com/tendermint/go-wire"
+ cfg "github.com/tendermint/go-config"
"github.com/tendermint/tendermint/config/tendermint_test"
nm "github.com/tendermint/tendermint/node"
"github.com/tendermint/tendermint/types"
+ "github.com/eris-ltd/eris-db/server"
)
// global variables for use across all tests
var (
- config server.ServerConfig
+ config cfg.Config
node *nm.Node
mempoolCount = 0
chainID string
@@ -116,7 +117,7 @@ func newNode(ready chan struct{}) {
node.Start()
// Run the RPC server.
- edb.StartRPC(config, node, app)
+ edb.StartRPC(server.DefaultServerConfig(), node, app)
ready <- struct{}{}
// Sleep forever
--
GitLab