fixes from rebase

This commit is contained in:
Ethan Buchman
2017-05-04 23:03:42 -04:00
parent 46151720f8
commit 75989342b0
3 changed files with 5 additions and 10 deletions

View File

@@ -43,7 +43,7 @@ func testStatus(t *testing.T, client rpc.HTTPClient) {
result := new(ctypes.ResultStatus)
_, err := client.Call("status", map[string]interface{}{}, result)
require.Nil(t, err)
assert.Equal(t, moniker, status.NodeInfo.Moniker)
assert.Equal(t, moniker, result.NodeInfo.Moniker)
}
//--------------------------------------------------------------------------------
@@ -158,8 +158,9 @@ func TestURITx(t *testing.T) {
testTx(t, GetURIClient(), true)
core.SetTxIndexer(&null.TxIndex{})
testTx(t, GetJSONClient(), false)
core.SetTxIndexer(node.ConsensusState().GetState().TxIndexer)
defer core.SetTxIndexer(node.ConsensusState().GetState().TxIndexer)
testTx(t, GetURIClient(), false)
}
func TestJSONTx(t *testing.T) {