feat!: delete getTreeNameFromConstructorFn (#287)

Closes #286 by deleting
`getTreeNameFromConstructorFn`.
Closes #288,
#289 by fixing those tests.
Inspired by #278
Includes two breaking changes:
1. `ComputeExtendedDataSquare` now accepts a parameter `treeName:
string`
2. `ImportExtendedDataSquare` now accepts a parameter `treeName: string`

---------

Co-authored-by: sontrinh16 <[email protected]>

Author: rootulp

extendeddatacrossword_test.go

@@ -42,7 +42,7 @@ func TestRepairExtendedDataSquare(t *testing.T) {
 		flattened[12], flattened[13] = nil, nil
 
 		// Re-import the data square.
-		eds, err := ImportExtendedDataSquare(flattened, codec, NewDefaultTree)
+		eds, err := ImportExtendedDataSquare(flattened, codec, DefaultTreeName)
 		if err != nil {
 			t.Errorf("ImportExtendedDataSquare failed: %v", err)
 		}
@@ -67,7 +67,7 @@ func TestRepairExtendedDataSquare(t *testing.T) {
 		flattened[12], flattened[13], flattened[14] = nil, nil, nil
 
 		// Re-import the data square.
-		eds, err := ImportExtendedDataSquare(flattened, codec, NewDefaultTree)
+		eds, err := ImportExtendedDataSquare(flattened, codec, DefaultTreeName)
 		if err != nil {
 			t.Errorf("ImportExtendedDataSquare failed: %v", err)
 		}
@@ -237,7 +237,7 @@ func BenchmarkRepair(b *testing.B) {
 
 		// Generate a new range original data square then extend it
 		square := genRandDS(originalDataWidth, shareSize)
-		eds, err := ComputeExtendedDataSquare(square, codec, NewDefaultTree)
+		eds, err := ComputeExtendedDataSquare(square, codec, DefaultTreeName)
 		if err != nil {
 			b.Error(err)
 		}
@@ -275,7 +275,7 @@ func BenchmarkRepair(b *testing.B) {
 					}
 
 					// Re-import the data square.
-					eds, _ = ImportExtendedDataSquare(flattened, codec, NewDefaultTree)
+					eds, _ = ImportExtendedDataSquare(flattened, codec, DefaultTreeName)
 
 					b.StartTimer()
 
@@ -301,7 +301,7 @@ func createTestEds(codec Codec, shareSize int) *ExtendedDataSquare {
 	eds, err := ComputeExtendedDataSquare([][]byte{
 		ones, twos,
 		threes, fours,
-	}, codec, NewDefaultTree)
+	}, codec, DefaultTreeName)
 	if err != nil {
 		panic(err)
 	}
@@ -443,10 +443,7 @@ func createTestEdsWithNMT(t *testing.T, codec Codec, shareSize, namespaceSize in
 		shares[i] = bytes.Repeat([]byte{byte(shareValue)}, shareSize)
 	}
 
-	treeConstructorFn, err := TreeFn("testing-tree")
-	require.NoError(t, err)
-
-	eds, err := ComputeExtendedDataSquare(shares, codec, treeConstructorFn)
+	eds, err := ComputeExtendedDataSquare(shares, codec, "testing-tree")
 	require.NoError(t, err)
 
 	return eds

extendeddatasquare.go

@@ -43,17 +43,11 @@ func (eds *ExtendedDataSquare) UnmarshalJSON(b []byte) error {
 		return err
 	}
 
-	var treeConstructor TreeConstructorFn
 	if aux.Tree == "" {
 		aux.Tree = DefaultTreeName
 	}
 
-	treeConstructor, err = TreeFn(aux.Tree)
-	if err != nil {
-		return err
-	}
-
-	importedEds, err := ImportExtendedDataSquare(aux.DataSquare, codecs[aux.Codec], treeConstructor)
+	importedEds, err := ImportExtendedDataSquare(aux.DataSquare, codecs[aux.Codec], aux.Tree)
 	if err != nil {
 		return err
 	}
@@ -66,7 +60,7 @@ func (eds *ExtendedDataSquare) UnmarshalJSON(b []byte) error {
 func ComputeExtendedDataSquare(
 	data [][]byte,
 	codec Codec,
-	treeCreatorFn TreeConstructorFn,
+	treeName string,
 ) (*ExtendedDataSquare, error) {
 	if len(data) > codec.MaxChunks() {
 		return nil, errors.New("number of chunks exceeds the maximum")
@@ -78,14 +72,14 @@ func ComputeExtendedDataSquare(
 		return nil, err
 	}
 
-	ds, err := newDataSquare(data, treeCreatorFn, uint(chunkSize))
+	treeCreatorFn, err := TreeFn(treeName)
 	if err != nil {
 		return nil, err
 	}
 
-	treeName := getTreeNameFromConstructorFn(treeCreatorFn)
-	if treeName == "" {
-		return nil, errors.New("tree name not found")
+	ds, err := newDataSquare(data, treeCreatorFn, uint(chunkSize))
+	if err != nil {
+		return nil, err
 	}
 
 	eds := ExtendedDataSquare{dataSquare: ds, codec: codec, treeName: treeName}
@@ -101,7 +95,7 @@ func ComputeExtendedDataSquare(
 func ImportExtendedDataSquare(
 	data [][]byte,
 	codec Codec,
-	treeCreatorFn TreeConstructorFn,
+	treeName string,
 ) (*ExtendedDataSquare, error) {
 	if len(data) > 4*codec.MaxChunks() {
 		return nil, errors.New("number of chunks exceeds the maximum")
@@ -113,14 +107,14 @@ func ImportExtendedDataSquare(
 		return nil, err
 	}
 
-	ds, err := newDataSquare(data, treeCreatorFn, uint(chunkSize))
+	treeCreatorFn, err := TreeFn(treeName)
 	if err != nil {
 		return nil, err
 	}
 
-	treeName := getTreeNameFromConstructorFn(treeCreatorFn)
-	if treeName == "" {
-		return nil, errors.New("tree name not found")
+	ds, err := newDataSquare(data, treeCreatorFn, uint(chunkSize))
+	if err != nil {
+		return nil, err
 	}
 
 	eds := ExtendedDataSquare{dataSquare: ds, codec: codec, treeName: treeName}
@@ -254,7 +248,7 @@ func (eds *ExtendedDataSquare) erasureExtendCol(codec Codec, i uint) error {
 }
 
 func (eds *ExtendedDataSquare) deepCopy(codec Codec) (ExtendedDataSquare, error) {
-	imported, err := ImportExtendedDataSquare(eds.Flattened(), codec, eds.createTreeFn)
+	imported, err := ImportExtendedDataSquare(eds.Flattened(), codec, eds.treeName)
 	return *imported, err
 }