diff --git a/erisdb/pipe/types.go b/erisdb/pipe/types.go index e0cd5e4aba3ada36b732e0b390d48cde3bca585c..d8e6be8e46f859951688d9fd32eb915bc7dd6613 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 5846b725f377b6d908980a4e910069b501fc3be1..1c4b2270c75be2c1bccce6ccf29ae94570d07748 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,