Update to the latest version of celestia-core (#175)

* move testutils to this package * update to latest version of celestia-core * move over test utils * update GenFilePV * move testutil's code to proper repo * linter * linter * fix multiple merge issues * replace celestia-core with tendermint Co-authored-by: Ismail Khoffi <Ismail.Khoffi@gmail.com>
renaynay · Nov 16, 2021 · 3e54e19 · 3e54e19
1 parent cb9b47f
commit 3e54e19
Show file tree

Hide file tree

Showing 30 changed files with 390 additions and 222 deletions.
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ test:
 .PHONY: test
 
 PB_PKGS=$(shell find . -name 'pb' -type d)
-PB_CORE=$(shell go list -f {{.Dir}} -m github.com/celestiaorg/celestia-core)
+PB_CORE=$(shell go list -f {{.Dir}} -m github.com/tendermint/tendermint)
 PB_GOGO=$(shell go list -f {{.Dir}} -m github.com/gogo/protobuf)
 
 ## pb-gen: Generate protobuf code for all /pb/*.proto files in the project.

diff --git a/core/client.go b/core/client.go
@@ -3,10 +3,10 @@ package core
 import (
 	"fmt"
 
-	corenode "github.com/celestiaorg/celestia-core/node"
-	"github.com/celestiaorg/celestia-core/rpc/client"
-	"github.com/celestiaorg/celestia-core/rpc/client/http"
-	"github.com/celestiaorg/celestia-core/rpc/client/local"
+	corenode "github.com/tendermint/tendermint/node"
+	"github.com/tendermint/tendermint/rpc/client"
+	"github.com/tendermint/tendermint/rpc/client/http"
+	"github.com/tendermint/tendermint/rpc/client/local"
 )
 
 // Client is an alias to Core Client.

diff --git a/core/config.go b/core/config.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 
-	"github.com/celestiaorg/celestia-core/config"
+	"github.com/tendermint/tendermint/config"
 )
 
 // Config is an alias for Core config.

diff --git a/core/fetcher.go b/core/fetcher.go
@@ -4,7 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/celestiaorg/celestia-core/types"
+	"github.com/tendermint/tendermint/types"
+
 	"github.com/celestiaorg/celestia-node/service/block"
 )
 

diff --git a/core/fetcher_test.go b/core/fetcher_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/celestiaorg/celestia-core/libs/bytes"
+	"github.com/tendermint/tendermint/libs/bytes"
 )
 
 func TestBlockFetcher_GetBlock_and_SubscribeNewBlockEvent(t *testing.T) {

diff --git a/core/init.go b/core/init.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"path/filepath"
 
-	tmrand "github.com/celestiaorg/celestia-core/libs/rand"
-	"github.com/celestiaorg/celestia-core/p2p"
-	"github.com/celestiaorg/celestia-core/privval"
-	"github.com/celestiaorg/celestia-core/types"
-	tmtime "github.com/celestiaorg/celestia-core/types/time"
+	tmrand "github.com/tendermint/tendermint/libs/rand"
+	"github.com/tendermint/tendermint/p2p"
+	"github.com/tendermint/tendermint/privval"
+	"github.com/tendermint/tendermint/types"
+	tmtime "github.com/tendermint/tendermint/types/time"
 
 	"github.com/celestiaorg/celestia-node/libs/utils"
 )
@@ -44,10 +44,7 @@ func Init(path string) (err error) {
 	var pv *privval.FilePV
 	keyPath := cfg.PrivValidatorKeyFile()
 	if !utils.Exists(keyPath) {
-		pv, err = privval.GenFilePV(keyPath, cfg.PrivValidatorStateFile(), defaultValKeyType)
-		if err != nil {
-			return
-		}
+		pv = privval.GenFilePV(keyPath, cfg.PrivValidatorStateFile())
 		pv.Save()
 		log.Info("New consensus private key is generated")
 	} else {

diff --git a/core/log_adapter.go b/core/log_adapter.go
@@ -5,7 +5,7 @@ import (
 
 	logging "github.com/ipfs/go-log/v2"
 
-	tmlog "github.com/celestiaorg/celestia-core/libs/log"
+	tmlog "github.com/tendermint/tendermint/libs/log"
 )
 
 var log = logging.Logger("core")

diff --git a/core/repo.go b/core/repo.go
@@ -3,7 +3,7 @@ package core
 import (
 	"errors"
 
-	"github.com/celestiaorg/celestia-core/config"
+	"github.com/tendermint/tendermint/config"
 )
 
 // ErrNotInited is used to signal when core is intended to be started without being initialized.

diff --git a/core/testing.go b/core/testing.go
@@ -4,10 +4,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/celestiaorg/celestia-core/abci/example/kvstore"
-	"github.com/celestiaorg/celestia-core/config"
-	"github.com/celestiaorg/celestia-core/node"
-	rpctest "github.com/celestiaorg/celestia-core/rpc/test"
+	"github.com/tendermint/tendermint/abci/example/kvstore"
+	"github.com/tendermint/tendermint/config"
+	"github.com/tendermint/tendermint/node"
+	rpctest "github.com/tendermint/tendermint/rpc/test"
 )
 
 // MockConfig provides a testing configuration for embedded Core Client.

diff --git a/go.mod b/go.mod
@@ -6,7 +6,6 @@ replace github.com/ipfs/go-verifcid => github.com/celestiaorg/go-verifcid v0.0.1
 
 require (
 	github.com/BurntSushi/toml v0.4.1
-	github.com/celestiaorg/celestia-core v0.0.2-0.20210924001615-488ac31b4b3c
 	github.com/celestiaorg/nmt v0.8.0
 	github.com/celestiaorg/rsmt2d v0.3.0
 	github.com/gogo/protobuf v1.3.2
@@ -38,6 +37,9 @@ require (
 	github.com/multiformats/go-multihash v0.0.15
 	github.com/spf13/cobra v1.2.1
 	github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942
+	github.com/tendermint/tendermint v0.34.14
 	go.uber.org/fx v1.14.2
 	go.uber.org/zap v1.19.0
 )
+
+replace github.com/tendermint/tendermint v0.34.14 => github.com/celestiaorg/celestia-core v0.34.14-celestia
diff --git a/go.sum b/go.sum
diff --git a/ipld/plugin/nmt_test.go b/ipld/plugin/nmt_test.go
@@ -1,15 +1,17 @@
 package plugin
 
 import (
+	"bytes"
 	"math"
+	"math/rand"
+	"sort"
 	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/celestiaorg/celestia-core/pkg/da"
-	"github.com/celestiaorg/celestia-core/testutils"
+	"github.com/tendermint/tendermint/pkg/da"
 )
 
 // TestNamespaceFromCID checks that deriving the Namespaced hash from
@@ -18,18 +20,19 @@ func TestNamespaceFromCID(t *testing.T) {
 	var tests = []struct {
 		randData [][]byte
 	}{
-		{randData: testutils.GenerateRandNamespacedRawData(4, namespaceSize, ShareSize)},
-		{randData: testutils.GenerateRandNamespacedRawData(16, 16, ShareSize)},
-		{randData: testutils.GenerateRandNamespacedRawData(4, 4, ShareSize)},
-		{randData: testutils.GenerateRandNamespacedRawData(4, namespaceSize, ShareSize/2)},
+		{randData: generateRandNamespacedRawData(4, namespaceSize, ShareSize)},
+		{randData: generateRandNamespacedRawData(16, 16, ShareSize)},
+		{randData: generateRandNamespacedRawData(4, 4, ShareSize)},
+		{randData: generateRandNamespacedRawData(4, namespaceSize, ShareSize/2)},
 	}
 
 	for i, tt := range tests {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			// create DAH from rand data
 			squareSize := uint64(math.Sqrt(float64(len(tt.randData))))
-			dah, err := da.NewDataAvailabilityHeader(squareSize, tt.randData)
+			eds, err := da.ExtendShares(squareSize, tt.randData)
 			require.NoError(t, err)
+			dah := da.NewDataAvailabilityHeader(eds)
 			// check to make sure NamespacedHash is correctly derived from CID
 			for _, row := range dah.RowsRoots {
 				c, err := CidFromNamespacedSha256(row)
@@ -41,3 +44,27 @@ func TestNamespaceFromCID(t *testing.T) {
 		})
 	}
 }
+
+// generateRandNamespacedRawData returns random namespaced raw data for testing purposes.
+func generateRandNamespacedRawData(total, nidSize, leafSize uint32) [][]byte {
+	data := make([][]byte, total)
+	for i := uint32(0); i < total; i++ {
+		nid := make([]byte, nidSize)
+
+		rand.Read(nid)
+		data[i] = nid
+	}
+	sortByteArrays(data)
+	for i := uint32(0); i < total; i++ {
+		d := make([]byte, leafSize)
+
+		rand.Read(d)
+		data[i] = append(data[i], d...)
+	}
+
+	return data
+}
+
+func sortByteArrays(src [][]byte) {
+	sort.Slice(src, func(i, j int) bool { return bytes.Compare(src[i], src[j]) < 0 })
+}
diff --git a/ipld/read.go b/ipld/read.go
@@ -9,8 +9,9 @@ import (
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
 
-	"github.com/celestiaorg/celestia-core/pkg/da"
-	"github.com/celestiaorg/celestia-core/pkg/wrapper"
+	"github.com/tendermint/tendermint/pkg/da"
+	"github.com/tendermint/tendermint/pkg/wrapper"
+
 	"github.com/celestiaorg/celestia-node/ipld/plugin"
 	"github.com/celestiaorg/nmt"
 	"github.com/celestiaorg/nmt/namespace"

diff --git a/ipld/read_test.go b/ipld/read_test.go
@@ -15,10 +15,9 @@ import (
 	mdutils "github.com/ipfs/go-merkledag/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/tendermint/tendermint/pkg/da"
+	"github.com/tendermint/tendermint/pkg/wrapper"
 
-	"github.com/celestiaorg/celestia-core/pkg/da"
-	"github.com/celestiaorg/celestia-core/pkg/wrapper"
-	"github.com/celestiaorg/celestia-core/testutils"
 	"github.com/celestiaorg/celestia-node/ipld/plugin"
 	"github.com/celestiaorg/celestia-node/service/header"
 	"github.com/celestiaorg/nmt"
@@ -239,10 +238,10 @@ func TestGetLeavesByNamespace(t *testing.T) {
 	var tests = []struct {
 		rawData [][]byte
 	}{
-		{rawData: testutils.GenerateRandNamespacedRawData(16, NamespaceSize, plugin.ShareSize)},
-		{rawData: testutils.GenerateRandNamespacedRawData(16, NamespaceSize, 8)},
-		{rawData: testutils.GenerateRandNamespacedRawData(4, NamespaceSize, plugin.ShareSize)},
-		{rawData: testutils.GenerateRandNamespacedRawData(16, NamespaceSize, 8)},
+		{rawData: generateRandNamespacedRawData(16, NamespaceSize, plugin.ShareSize)},
+		{rawData: generateRandNamespacedRawData(16, NamespaceSize, 8)},
+		{rawData: generateRandNamespacedRawData(4, NamespaceSize, plugin.ShareSize)},
+		{rawData: generateRandNamespacedRawData(16, NamespaceSize, 8)},
 	}
 
 	for i, tt := range tests {
@@ -257,8 +256,9 @@ func TestGetLeavesByNamespace(t *testing.T) {
 			tt.rawData[(len(tt.rawData)/2)+1] = expected
 
 			// generate DAH
-			dah, err := da.NewDataAvailabilityHeader(squareSize, tt.rawData)
+			eds, err := da.ExtendShares(squareSize, tt.rawData)
 			require.NoError(t, err)
+			dah := da.NewDataAvailabilityHeader(eds)
 
 			// put raw data in DAG
 			dag := mdutils.Mock()
@@ -297,3 +297,23 @@ func rowRootsByNamespaceID(nID namespace.ID, dah *da.DataAvailabilityHeader) ([]
 	}
 	return roots, nil
 }
+
+// generateRandNamespacedRawData returns random namespaced raw data for testing purposes.
+func generateRandNamespacedRawData(total, nidSize, leafSize uint32) [][]byte {
+	data := make([][]byte, total)
+	for i := uint32(0); i < total; i++ {
+		nid := make([]byte, nidSize)
+
+		rand.Read(nid)
+		data[i] = nid
+	}
+	sortByteArrays(data)
+	for i := uint32(0); i < total; i++ {
+		d := make([]byte, leafSize)
+
+		rand.Read(d)
+		data[i] = append(data[i], d...)
+	}
+
+	return data
+}
diff --git a/ipld/test_helpers.go b/ipld/test_helpers.go
@@ -13,7 +13,8 @@ import (
 
 	"github.com/celestiaorg/rsmt2d"
 
-	"github.com/celestiaorg/celestia-core/pkg/wrapper"
+	"github.com/tendermint/tendermint/pkg/wrapper"
+
 	"github.com/celestiaorg/celestia-node/ipld/plugin"
 )
 

diff --git a/ipld/write.go b/ipld/write.go
@@ -10,7 +10,7 @@ import (
 	"github.com/celestiaorg/nmt"
 	"github.com/celestiaorg/rsmt2d"
 
-	"github.com/celestiaorg/celestia-core/pkg/wrapper"
+	"github.com/tendermint/tendermint/pkg/wrapper"
 )
 
 // PutData posts erasured block data to IPFS using the provided ipld.NodeAdder.

diff --git a/service/block/erasure.go b/service/block/erasure.go
@@ -3,7 +3,8 @@ package block
 import (
 	"math"
 
-	"github.com/celestiaorg/celestia-core/pkg/wrapper"
+	"github.com/tendermint/tendermint/pkg/wrapper"
+
 	"github.com/celestiaorg/rsmt2d"
 )
 

diff --git a/service/block/event_test.go b/service/block/event_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/celestiaorg/celestia-core/testutils"
-	core "github.com/celestiaorg/celestia-core/types"
+	core "github.com/tendermint/tendermint/types"
+
 	"github.com/celestiaorg/celestia-node/service/header"
 )
 
@@ -92,7 +92,7 @@ func (m *mockFetcher) generateBlocks(t *testing.T, num int) []Block {
 func generateRawAndExtendedBlock(t *testing.T) (*RawBlock, *Block) {
 	t.Helper()
 
-	data, err := testutils.GenerateRandomBlockData(1, 1, 1, 1, 40)
+	data, err := GenerateRandomBlockData(1, 1, 1, 1, 40)
 	if err != nil {
 		t.Fatal(err)
 	}