modify sort for coinbase reward (#261)

diff --git a/proposal/proposal_test.go b/proposal/proposal_test.go
index cf6c82a..d8f7abf 100644 (file)
--- a/proposal/proposal_test.go
+++ b/proposal/proposal_test.go
@@ -176,13 +176,13 @@ func TestCountCoinbaseTxRewards(t *testing.T) {
                        },
                        wantRewards: []state.CoinbaseReward{
                                state.CoinbaseReward{
                        },
                        wantRewards: []state.CoinbaseReward{
                                state.CoinbaseReward{

-                                       Amount:         20,
-                                       ControlProgram: []byte{0x52},
-                               },
-                               state.CoinbaseReward{

                                        Amount:         34,
                                        ControlProgram: []byte{0x51},
                                },
                                        Amount:         34,
                                        ControlProgram: []byte{0x51},
                                },

+                               state.CoinbaseReward{
+                                       Amount:         20,
+                                       ControlProgram: []byte{0x52},
+                               },

                        },
                },
                {
                        },
                },
                {


@@ -210,6 +210,7 @@ func TestCountCoinbaseTxRewards(t *testing.T) {
                        },
                        consensusResult: &state.ConsensusResult{
                                CoinbaseReward: map[string]uint64{
                        },
                        consensusResult: &state.ConsensusResult{
                                CoinbaseReward: map[string]uint64{

+                                       "50": 20,

                                        "51": 10,
                                        "52": 20,
                                        "53": 30,
                                        "51": 10,
                                        "52": 20,
                                        "53": 30,


@@ -217,16 +218,20 @@ func TestCountCoinbaseTxRewards(t *testing.T) {
                        },
                        wantRewards: []state.CoinbaseReward{
                                state.CoinbaseReward{
                        },
                        wantRewards: []state.CoinbaseReward{
                                state.CoinbaseReward{

-                                       Amount:         20,
-                                       ControlProgram: []byte{0x52},
+                                       Amount:         34,
+                                       ControlProgram: []byte{0x51},

                                },
                                state.CoinbaseReward{
                                        Amount:         30,
                                        ControlProgram: []byte{0x53},
                                },
                                state.CoinbaseReward{
                                },
                                state.CoinbaseReward{
                                        Amount:         30,
                                        ControlProgram: []byte{0x53},
                                },
                                state.CoinbaseReward{

-                                       Amount:         34,
-                                       ControlProgram: []byte{0x51},
+                                       Amount:         20,
+                                       ControlProgram: []byte{0x52},
+                               },
+                               state.CoinbaseReward{
+                                       Amount:         20,
+                                       ControlProgram: []byte{0x50},

                                },
                        },
                },
                                },
                        },
                },

diff --git a/protocol/state/consensus_result.go b/protocol/state/consensus_result.go
index ff08429..9313c4b 100644 (file)
--- a/protocol/state/consensus_result.go
+++ b/protocol/state/consensus_result.go
@@ -38,9 +38,11 @@ type CoinbaseReward struct {
 // SortByAmount implements sort.Interface for CoinbaseReward slices
 type SortByAmount []CoinbaseReward
 
 // SortByAmount implements sort.Interface for CoinbaseReward slices
 type SortByAmount []CoinbaseReward
 

-func (a SortByAmount) Len() int           { return len(a) }
-func (a SortByAmount) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a SortByAmount) Less(i, j int) bool { return a[i].Amount < a[j].Amount }
+func (a SortByAmount) Len() int      { return len(a) }
+func (a SortByAmount) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a SortByAmount) Less(i, j int) bool {
+       return a[i].Amount > a[j].Amount || (a[i].Amount == a[j].Amount && hex.EncodeToString(a[i].ControlProgram) > hex.EncodeToString(a[j].ControlProgram))
+}

 
 // CalCoinbaseReward calculate the coinbase reward for block
 func CalCoinbaseReward(block *types.Block) (*CoinbaseReward, error) {
 
 // CalCoinbaseReward calculate the coinbase reward for block
 func CalCoinbaseReward(block *types.Block) (*CoinbaseReward, error) {

diff --git a/protocol/validation/block.go b/protocol/validation/block.go
index 5e12cbd..9ed82be 100644 (file)
--- a/protocol/validation/block.go
+++ b/protocol/validation/block.go
@@ -2,6 +2,7 @@ package validation
 
 import (
        "bytes"
 
 import (
        "bytes"

+       "encoding/hex"

        "time"
 
        log "github.com/sirupsen/logrus"
        "time"
 
        log "github.com/sirupsen/logrus"


@@ -64,7 +65,7 @@ func checkCoinbaseTx(b *bc.Block, rewards []state.CoinbaseReward) error {
                }
 
                if res := bytes.Compare(rewards[i].ControlProgram, out.ControlProgram.Code); res != 0 {
                }
 
                if res := bytes.Compare(rewards[i].ControlProgram, out.ControlProgram.Code); res != 0 {

-                       return errors.Wrapf(ErrWrongCoinbaseTransaction, "dismatch output control_program, got:%d, want:%d", out.ControlProgram.Code, rewards[i].ControlProgram)
+                       return errors.Wrapf(ErrWrongCoinbaseTransaction, "dismatch output control_program, got:%s, want:%s", hex.EncodeToString(out.ControlProgram.Code), hex.EncodeToString(rewards[i].ControlProgram))

                }
        }
        return nil
                }
        }
        return nil