From 3046b2a9553f97640f938c53963044c592c12d24 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Fri, 8 Jul 2016 18:32:40 +0200
Subject: [PATCH] Bug: mock_web_api_test fails on wire decode of TestData
---
test/mock/pipe.go | 7 +++++++
test/testdata/testdata/testdata.go | 14 ++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/test/mock/pipe.go b/test/mock/pipe.go
index cc6460da..e1e41612 100644
--- a/test/mock/pipe.go
+++ b/test/mock/pipe.go
@@ -1,6 +1,8 @@
package mock
import (
+ "fmt"
+
account "github.com/eris-ltd/eris-db/account"
core_types "github.com/eris-ltd/eris-db/core/types"
definitions "github.com/eris-ltd/eris-db/definitions"
@@ -88,6 +90,11 @@ func (this *MockPipe) SetConsensusEngine(_ definitions.ConsensusEngine) error {
// TODO: [ben] mock consensus engine
return nil
}
+
+func (this *MockPipe) GetTendermintPipe() (definitions.TendermintPipe, error) {
+ return nil, fmt.Errorf("Tendermint pipe is not supported by mocked pipe.")
+}
+
// Components
// Accounts
diff --git a/test/testdata/testdata/testdata.go b/test/testdata/testdata/testdata.go
index 811ee655..d780d80a 100644
--- a/test/testdata/testdata/testdata.go
+++ b/test/testdata/testdata/testdata.go
@@ -1,7 +1,6 @@
package testdata
import (
- wire "github.com/tendermint/go-wire"
account "github.com/eris-ltd/eris-db/account"
core_types "github.com/eris-ltd/eris-db/core/types"
@@ -697,15 +696,10 @@ type (
)
func LoadTestData() *TestData {
- var err error
- //codec := core_types.NewTCodec()
- testData := TestData{}
- testDataI := wire.ReadJSON(testData, []byte(testDataJson), &err)
- /*err := codec.DecodeBytes(testData, []byte(testDataJson))
- */
- if err != nil {
+ codec := rpc_v0.NewTCodec()
+ testData := &TestData{}
+ if err := codec.DecodeBytes(testData, []byte(testDataJson)); err != nil {
panic(err)
}
- testData = testDataI.(TestData)
- return &testData
+ return testData
}
--
GitLab