From f5c1a09d4dedb5af4116a6948544f597d077c174 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Mon, 11 Jul 2016 12:59:47 +0100
Subject: [PATCH] debug main
---
rpc/tendermint/test/common_test.go | 28 +++-------------------------
rpc/tendermint/test/genesis.go | 2 +-
rpc/tendermint/test/runner/main.go | 13 +++++++++++++
rpc/tendermint/test/shared.go | 4 ++--
4 files changed, 19 insertions(+), 28 deletions(-)
create mode 100644 rpc/tendermint/test/runner/main.go
diff --git a/rpc/tendermint/test/common_test.go b/rpc/tendermint/test/common_test.go
index 0c5ba609..b2b0a489 100644
--- a/rpc/tendermint/test/common_test.go
+++ b/rpc/tendermint/test/common_test.go
@@ -2,36 +2,14 @@ package rpctest
import (
"testing"
- "github.com/eris-ltd/eris-db/test/fixtures"
- "fmt"
"os"
)
// Needs to be in a _test.go file to be picked up
func TestMain(m *testing.M) {
- ffs := fixtures.NewFileFixtures("Eris-DB")
- defer ffs.RemoveAll()
-
- err := initGlobalVariables(ffs)
-
- if err != nil {
- panic(err)
- }
-
- saveNewPriv()
-
- // start a node
-
- ready := make(chan error)
- go newNode(ready)
- err = <-ready
-
- if err != nil {
- panic(err)
- }
-
- returnValue := m.Run()
- fmt.Println("foooooo", returnValue)
+ returnValue := TestWrapper(func() int {
+ return m.Run()
+ })
defer os.Exit(returnValue)
}
diff --git a/rpc/tendermint/test/genesis.go b/rpc/tendermint/test/genesis.go
index 4ab7b0d4..66b0c3ca 100644
--- a/rpc/tendermint/test/genesis.go
+++ b/rpc/tendermint/test/genesis.go
@@ -2,7 +2,7 @@ package rpctest
// priv keys generated deterministically eg rpc/tests/shared.go
var defaultGenesis = `{
- "chain_id" : "tendermint_test",
+ "chain_id" : "MyChainId",
"accounts": [
{
"address": "E9B5D87313356465FAE33C406CE2C2979DE60BCB",
diff --git a/rpc/tendermint/test/runner/main.go b/rpc/tendermint/test/runner/main.go
new file mode 100644
index 00000000..ca775c1a
--- /dev/null
+++ b/rpc/tendermint/test/runner/main.go
@@ -0,0 +1,13 @@
+package main
+
+import (
+ "fmt"
+
+ "github.com/eris-ltd/eris-db/util"
+ "github.com/eris-ltd/eris-db/rpc/tendermint/test"
+)
+
+func main() {
+ fmt.Printf("%s", util.IsAddress("hello"), rpctest.Successor(2))
+ //defer os.Exit(0)
+}
\ No newline at end of file
diff --git a/rpc/tendermint/test/shared.go b/rpc/tendermint/test/shared.go
index 39b47367..22603b65 100644
--- a/rpc/tendermint/test/shared.go
+++ b/rpc/tendermint/test/shared.go
@@ -107,8 +107,8 @@ func newNode(ready chan error) {
// Sleep forever
if err == nil {
- ch := make(chan struct{})
- <-ch
+ //ch := make(chan struct{})
+ //<-ch
}
}
--
GitLab