From 34f6f50a07a9c2a4a44ff1b7710bb9ef1df44478 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Thu, 10 Dec 2015 11:09:25 -0800
Subject: [PATCH] Conform to go-merkle SimpleProof.Aunts

---
 consensus/reactor.go   |  2 +-
 types/part_set.go      | 25 ++++++++++++++-----------
 types/part_set_test.go |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/consensus/reactor.go b/consensus/reactor.go
index a96790c7..55ef1da7 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -173,7 +173,7 @@ func (conR *ConsensusReactor) Receive(chID byte, peer *p2p.Peer, msgBytes []byte
 		case *ProposalPOLMessage:
 			ps.ApplyProposalPOLMessage(msg)
 		case *BlockPartMessage:
-			ps.SetHasProposalBlockPart(msg.Height, msg.Round, msg.Part.Proof.Index)
+			ps.SetHasProposalBlockPart(msg.Height, msg.Round, msg.Part.Index)
 			_, err = conR.conS.AddProposalBlockPart(msg.Height, msg.Part)
 		default:
 			log.Warn(Fmt("Unknown message type %v", reflect.TypeOf(msg)))
diff --git a/types/part_set.go b/types/part_set.go
index 9ab557bd..0883140d 100644
--- a/types/part_set.go
+++ b/types/part_set.go
@@ -24,8 +24,9 @@ var (
 )
 
 type Part struct {
-	Proof merkle.SimpleProof `json:"proof"`
+	Index int                `json:"index"`
 	Bytes []byte             `json:"bytes"`
+	Proof merkle.SimpleProof `json:"proof"`
 
 	// Cache
 	hash []byte
@@ -47,12 +48,13 @@ func (part *Part) String() string {
 }
 
 func (part *Part) StringIndented(indent string) string {
-	return fmt.Sprintf(`Part{
-%s  Proof: %v
+	return fmt.Sprintf(`Part{#%v
 %s  Bytes: %X...
+%s  Proof: %v
 %s}`,
-		indent, part.Proof.StringIndented(indent+"  "),
+		part.Index,
 		indent, Fingerprint(part.Bytes),
+		indent, part.Proof.StringIndented(indent+"  "),
 		indent)
 }
 
@@ -101,6 +103,7 @@ func NewPartSetFromData(data []byte) *PartSet {
 	partsBitArray := NewBitArray(total)
 	for i := 0; i < total; i++ {
 		part := &Part{
+			Index: i,
 			Bytes: data[i*partSize : MinInt(len(data), (i+1)*partSize)],
 		}
 		parts[i] = part
@@ -108,13 +111,13 @@ func NewPartSetFromData(data []byte) *PartSet {
 		partsBitArray.SetIndex(i, true)
 	}
 	// Compute merkle proofs
-	proofs := merkle.SimpleProofsFromHashables(parts_)
+	root, proofs := merkle.SimpleProofsFromHashables(parts_)
 	for i := 0; i < total; i++ {
 		parts[i].Proof = *proofs[i]
 	}
 	return &PartSet{
 		total:         total,
-		hash:          proofs[0].RootHash,
+		hash:          root,
 		parts:         parts,
 		partsBitArray: partsBitArray,
 		count:         total,
@@ -190,23 +193,23 @@ func (ps *PartSet) AddPart(part *Part) (bool, error) {
 	defer ps.mtx.Unlock()
 
 	// Invalid part index
-	if part.Proof.Index >= ps.total {
+	if part.Index >= ps.total {
 		return false, ErrPartSetUnexpectedIndex
 	}
 
 	// If part already exists, return false.
-	if ps.parts[part.Proof.Index] != nil {
+	if ps.parts[part.Index] != nil {
 		return false, nil
 	}
 
 	// Check hash proof
-	if !part.Proof.Verify(part.Hash(), ps.Hash()) {
+	if !part.Proof.Verify(part.Index, ps.total, part.Hash(), ps.Hash()) {
 		return false, ErrPartSetInvalidProof
 	}
 
 	// Add part
-	ps.parts[part.Proof.Index] = part
-	ps.partsBitArray.SetIndex(part.Proof.Index, true)
+	ps.parts[part.Index] = part
+	ps.partsBitArray.SetIndex(part.Index, true)
 	ps.count++
 	return true, nil
 }
diff --git a/types/part_set_test.go b/types/part_set_test.go
index 0260af7f..4e74d777 100644
--- a/types/part_set_test.go
+++ b/types/part_set_test.go
@@ -69,7 +69,7 @@ func TestWrongProof(t *testing.T) {
 
 	// Test adding a part with wrong trail.
 	part := partSet.GetPart(0)
-	part.Proof.InnerHashes[0][0] += byte(0x01)
+	part.Proof.Aunts[0][0] += byte(0x01)
 	added, err := partSet2.AddPart(part)
 	if added || err == nil {
 		t.Errorf("Expected to fail adding a part with bad trail.")