revert tree.Push api to only use []byte and not also the axis (celest…

…iaorg#126)

datasquare.go

@@ -222,8 +222,8 @@ func (ds *dataSquare) getRowRoot(x uint) []byte {
 	}
 
 	tree := ds.createTreeFn(Row, x)
-	for i, d := range ds.row(x) {
-		tree.Push(d, SquareIndex{Cell: uint(i), Axis: x})
+	for _, d := range ds.row(x) {
+		tree.Push(d)
 	}
 
 	return tree.Root()
@@ -246,8 +246,8 @@ func (ds *dataSquare) getColRoot(y uint) []byte {
 	}
 
 	tree := ds.createTreeFn(Col, y)
-	for i, d := range ds.col(y) {
-		tree.Push(d, SquareIndex{Axis: y, Cell: uint(i)})
+	for _, d := range ds.col(y) {
+		tree.Push(d)
 	}
 
 	return tree.Root()

datasquare_test.go

@@ -219,7 +219,7 @@ func computeRowProof(ds *dataSquare, x uint, y uint) ([]byte, [][]byte, uint, ui
 	data := ds.row(x)
 
 	for i := uint(0); i < ds.width; i++ {
-		tree.Push(data[i], SquareIndex{Axis: y, Cell: uint(i)})
+		tree.Push(data[i])
 	}
 
 	merkleRoot, proof, proofIndex, numLeaves := treeProve(tree.(*DefaultTree), int(y))
@@ -231,7 +231,7 @@ func computeColProof(ds *dataSquare, x uint, y uint) ([]byte, [][]byte, uint, ui
 	data := ds.col(y)
 
 	for i := uint(0); i < ds.width; i++ {
-		tree.Push(data[i], SquareIndex{Axis: y, Cell: uint(i)})
+		tree.Push(data[i])
 	}
 	// TODO(ismail): check for overflow when casting from uint -> int
 	merkleRoot, proof, proofIndex, numLeaves := treeProve(tree.(*DefaultTree), int(x))

extendeddatacrossword.go

@@ -365,8 +365,8 @@ func noMissingData(input [][]byte) bool {
 
 func (eds *ExtendedDataSquare) computeSharesRoot(shares [][]byte, axis Axis, i uint) []byte {
 	tree := eds.createTreeFn(axis, i)
-	for cell, d := range shares {
-		tree.Push(d, SquareIndex{Cell: uint(cell), Axis: i})
+	for _, d := range shares {
+		tree.Push(d)
 	}
 	return tree.Root()
 }

tree.go

@@ -17,7 +17,7 @@ type SquareIndex struct {
 
 // Tree wraps Merkle tree implementations to work with rsmt2d
 type Tree interface {
-	Push(data []byte, idx SquareIndex)
+	Push(data []byte)
 	Root() []byte
 }
 
@@ -36,7 +36,7 @@ func NewDefaultTree(axis Axis, index uint) Tree {
 	}
 }
 
-func (d *DefaultTree) Push(data []byte, _idx SquareIndex) {
+func (d *DefaultTree) Push(data []byte) {
 	// ignore the idx, as this implementation doesn't need that info
 	d.leaves = append(d.leaves, data)
 }