From b42d2580c1a3dce0673edd36af8170737499369d Mon Sep 17 00:00:00 2001 From: Hendrik Hofstadt Date: Wed, 17 Oct 2018 00:04:59 +0200 Subject: [PATCH] Fixes to rebase --- privval/ipc_test.go | 6 +++--- privval/tcp_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/privval/ipc_test.go b/privval/ipc_test.go index 7359b32b..c8d6dfc7 100644 --- a/privval/ipc_test.go +++ b/privval/ipc_test.go @@ -20,7 +20,7 @@ func TestIPCPVVote(t *testing.T) { sc, rs = testSetupIPCSocketPair(t, chainID, types.NewMockPV()) ts = time.Now() - vType = types.VoteTypePrecommit + vType = types.PrecommitType want = &types.Vote{Timestamp: ts, Type: vType} have = &types.Vote{Timestamp: ts, Type: vType} ) @@ -38,7 +38,7 @@ func TestIPCPVVoteResetDeadline(t *testing.T) { sc, rs = testSetupIPCSocketPair(t, chainID, types.NewMockPV()) ts = time.Now() - vType = types.VoteTypePrecommit + vType = types.PrecommitType want = &types.Vote{Timestamp: ts, Type: vType} have = &types.Vote{Timestamp: ts, Type: vType} ) @@ -65,7 +65,7 @@ func TestIPCPVVoteKeepalive(t *testing.T) { sc, rs = testSetupIPCSocketPair(t, chainID, types.NewMockPV()) ts = time.Now() - vType = types.VoteTypePrecommit + vType = types.PrecommitType want = &types.Vote{Timestamp: ts, Type: vType} have = &types.Vote{Timestamp: ts, Type: vType} ) diff --git a/privval/tcp_test.go b/privval/tcp_test.go index 6a1364cd..6549759d 100644 --- a/privval/tcp_test.go +++ b/privval/tcp_test.go @@ -96,7 +96,7 @@ func TestSocketPVVoteResetDeadline(t *testing.T) { sc, rs = testSetupSocketPair(t, chainID, types.NewMockPV()) ts = time.Now() - vType = types.VoteTypePrecommit + vType = types.PrecommitType want = &types.Vote{Timestamp: ts, Type: vType} have = &types.Vote{Timestamp: ts, Type: vType} ) @@ -123,7 +123,7 @@ func TestSocketPVVoteKeepalive(t *testing.T) { sc, rs = testSetupSocketPair(t, chainID, types.NewMockPV()) ts = time.Now() - vType = types.VoteTypePrecommit + vType = types.PrecommitType want = &types.Vote{Timestamp: ts, Type: vType} have = &types.Vote{Timestamp: ts, Type: vType} )