From a1221b45250988905072105a8aacd7a685987822 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 5 Apr 2016 16:05:22 -0400
Subject: [PATCH] still working on tests ...
---
erisdb/pipe/types.go | 4 +++-
test/testdata/testdata/testdata.go | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/erisdb/pipe/types.go b/erisdb/pipe/types.go
index e0cd5e4a..d8e6be8e 100644
--- a/erisdb/pipe/types.go
+++ b/erisdb/pipe/types.go
@@ -2,6 +2,8 @@ package pipe
import (
"github.com/eris-ltd/eris-db/account"
+ txs "github.com/eris-ltd/eris-db/txs"
+
"github.com/tendermint/go-p2p" // NodeInfo (drop this!)
csus "github.com/tendermint/tendermint/consensus"
"github.com/tendermint/tendermint/types"
@@ -140,7 +142,7 @@ type (
// UnconfirmedTxs
UnconfirmedTxs struct {
- Txs []types.Tx `json:"txs"`
+ Txs []txs.Tx `json:"txs"`
}
// BroadcastTx or Transact
diff --git a/test/testdata/testdata/testdata.go b/test/testdata/testdata/testdata.go
index 5846b725..1c4b2270 100644
--- a/test/testdata/testdata/testdata.go
+++ b/test/testdata/testdata/testdata.go
@@ -266,7 +266,7 @@ var testDataJson = `{
"validators": [
{
"address": "37236DF251AB70022B1DA351F08A20FB52443E37",
- "pub_key": "CB3688B7561D488A2A4834E1AEE9398BEF94844D8BDBBCA980C11E3654A45906",
+ "pub_key": [1, "CB3688B7561D488A2A4834E1AEE9398BEF94844D8BDBBCA980C11E3654A45906"],
"bond_height": 0,
"unbond_height": 0,
"last_commit_height": 0,
@@ -283,7 +283,7 @@ var testDataJson = `{
"bonded_validators": [
{
"address": "37236DF251AB70022B1DA351F08A20FB52443E37",
- "pub_key": "CB3688B7561D488A2A4834E1AEE9398BEF94844D8BDBBCA980C11E3654A45906",
+ "pub_key": [1, "CB3688B7561D488A2A4834E1AEE9398BEF94844D8BDBBCA980C11E3654A45906"],
"bond_height": 0,
"unbond_height": 0,
"last_commit_height": 0,
--
GitLab