fix voters sort

kowala-tech · Oct 9, 2018 · 9b83557 · 9b83557
1 parent c7902fd
commit 9b83557
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 1 deletion.
diff --git a/client/core/types/voters.go b/client/core/types/voters.go
@@ -113,7 +113,7 @@ func (voters voters) Swap(i, j int) {
 }
 
 func (voters voters) Less(i, j int) bool {
-	return bytes.Compare(voters[i].Address().Bytes(), voters[j].Address().Bytes()) == 0
+	return bytes.Compare(voters[i].Address().Bytes(), voters[j].Address().Bytes()) == -1
 }
 
 // GetRlp returns encoded bytes for one voter

diff --git a/client/core/types/voters_test.go b/client/core/types/voters_test.go
@@ -81,6 +81,40 @@ func TestVoters_UpdateWeightChangesProposer(t *testing.T) {
 	assert.Equal(t, 3, voters.Len())
 }
 
+func TestVoters_UpdateWeightChangesProposerWith2Voters(t *testing.T) {
+	voters1, err := NewVoters([]*Voter{voterSet[0], voterSet[1], voterSet[2]})
+	require.NoError(t, err)
+
+	voters2, err := NewVoters([]*Voter{voterSet[0], voterSet[1], voterSet[2]})
+	require.NoError(t, err)
+
+	proposer1 := voters1.NextProposer()
+	assert.Equal(t, voterSet[1], proposer1)
+	assert.Equal(t, big.NewInt(101), proposer1.weight)
+	assert.Equal(t, big.NewInt(200), voters1.At(0).weight)
+	assert.Equal(t, big.NewInt(101), voters1.At(1).weight)
+	assert.Equal(t, big.NewInt(198), voters1.At(2).weight)
+	assert.Equal(t, 3, voters1.Len())
+
+	proposer2 := voters2.NextProposer()
+	assert.Equal(t, voterSet[1], proposer2)
+	assert.Equal(t, big.NewInt(101), proposer2.weight)
+	assert.Equal(t, big.NewInt(200), voters2.At(0).weight)
+	assert.Equal(t, big.NewInt(101), voters2.At(1).weight)
+	assert.Equal(t, big.NewInt(198), voters2.At(2).weight)
+	assert.Equal(t, 3, voters2.Len())
+}
+
+func TestVoters_NewVotersReturnsSortedArray(t *testing.T) {
+	voters, err := NewVoters([]*Voter{voterSet[1], voterSet[0], voterSet[2]})
+	require.NoError(t, err)
+
+	assert.Equal(t, voterSet[0].Address().String(), voters.At(0).Address().String())
+	assert.Equal(t, voterSet[1].Address().String(), voters.At(1).Address().String())
+	assert.Equal(t, voterSet[2].Address().String(), voters.At(2).Address().String())
+	assert.Equal(t, 3, voters.Len())
+}
+
 func TestVoters_UpdateWeightChangesProposerElections(t *testing.T) {
 	voters, err := NewVoters([]*Voter{voterSet[0], voterSet[1], voterSet[2]})
 	require.NoError(t, err)
@@ -108,6 +142,53 @@ func TestVoters_UpdateWeightChangesProposerElections(t *testing.T) {
 	}
 }
 
+func TestVoters_UpdateWeightChangesProposerElectionsWith2Voters(t *testing.T) {
+	voters1, err := NewVoters([]*Voter{voterSet[0], voterSet[1], voterSet[2]})
+	require.NoError(t, err)
+	require.Equal(t, 3, voters1.Len())
+
+	voters2, err := NewVoters([]*Voter{voterSet[0], voterSet[1], voterSet[2]})
+	require.NoError(t, err)
+	require.Equal(t, 3, voters2.Len())
+
+	elections := []struct {
+		proposerWeight *big.Int
+		voter1weight   *big.Int
+		voter2weight   *big.Int
+		voter3weight   *big.Int
+	}{
+		{big.NewInt(200), big.NewInt(200), big.NewInt(202), big.NewInt(297)},
+		{big.NewInt(297), big.NewInt(300), big.NewInt(303), big.NewInt(297)},
+		{big.NewInt(303), big.NewInt(400), big.NewInt(303), big.NewInt(396)},
+	}
+
+	for round, tc := range elections {
+		t.Run(fmt.Sprintf("round %d", round), func(t *testing.T) {
+			proposer1 := voters1.NextProposer()
+			proposer2 := voters2.NextProposer()
+
+			assert.Equal(t, tc.proposerWeight, proposer2.weight)
+			assert.Equal(t, voters1.At(0).address, voters2.At(0).address)
+			assert.Equal(t, voters1.At(1).address, voters2.At(1).address)
+			assert.Equal(t, voters1.At(2).address, voters2.At(2).address)
+
+			assert.Equal(t, voters1.At(0).weight, voters2.At(0).weight)
+			assert.Equal(t, voters1.At(1).weight, voters2.At(1).weight)
+			assert.Equal(t, voters1.At(2).weight, voters2.At(2).weight)
+
+			assert.Equal(t, tc.proposerWeight, proposer1.weight)
+			assert.Equal(t, tc.voter1weight, voters1.At(0).weight)
+			assert.Equal(t, tc.voter2weight, voters1.At(1).weight)
+			assert.Equal(t, tc.voter3weight, voters1.At(2).weight)
+
+			assert.Equal(t, tc.proposerWeight, proposer2.weight)
+			assert.Equal(t, tc.voter1weight, voters2.At(0).weight)
+			assert.Equal(t, tc.voter2weight, voters2.At(1).weight)
+			assert.Equal(t, tc.voter3weight, voters2.At(2).weight)
+		})
+	}
+}
+
 func TestVoters_IsHashable(t *testing.T) {
 	voters1, err := NewVoters([]*Voter{voterSet[0], voterSet[1], voterSet[2]})
 	require.NoError(t, err)