refactor(share): Consolidate share pkg (#1177)

Resolves celestiaorg/celestia-node#878 Co-authored-by: rene <41963722+renaynay@users.noreply.github.com>
celestiaorg · Apr 12, 2023 · 22b12e9 · 22b12e9
1 parent 603c1f0
commit 22b12e9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/fraud/bad_encoding.go b/fraud/bad_encoding.go
@@ -8,13 +8,12 @@ import (
 	"github.com/tendermint/tendermint/pkg/consts"
 	"github.com/tendermint/tendermint/pkg/wrapper"
 
-	"github.com/celestiaorg/rsmt2d"
-
 	pb "github.com/celestiaorg/celestia-node/fraud/pb"
 	"github.com/celestiaorg/celestia-node/header"
-	"github.com/celestiaorg/celestia-node/ipld"
-	ipld_pb "github.com/celestiaorg/celestia-node/ipld/pb"
-	"github.com/celestiaorg/celestia-node/ipld/plugin"
+	"github.com/celestiaorg/celestia-node/share"
+	"github.com/celestiaorg/celestia-node/share/ipld"
+	ipld_pb "github.com/celestiaorg/celestia-node/share/pb"
+	"github.com/celestiaorg/rsmt2d"
 )
 
 func init() {
@@ -27,7 +26,7 @@ type BadEncodingProof struct {
 	// ShareWithProof contains all shares from row or col.
 	// Shares that did not pass verification in rsmt2d will be nil.
 	// For non-nil shares MerkleProofs are computed.
-	Shares []*ipld.ShareWithProof
+	Shares []*share.ShareWithProof
 	// Index represents the row/col index where ErrByzantineRow/ErrByzantineColl occurred.
 	Index uint32
 	// Axis represents the axis that verification failed on.
@@ -39,7 +38,7 @@ type BadEncodingProof struct {
 func CreateBadEncodingProof(
 	hash []byte,
 	height uint64,
-	errByzantine *ipld.ErrByzantine,
+	errByzantine *share.ErrByzantine,
 ) Proof {
 
 	return &BadEncodingProof{
@@ -92,7 +91,7 @@ func (p *BadEncodingProof) UnmarshalBinary(data []byte) error {
 	befp := &BadEncodingProof{
 		headerHash:  in.HeaderHash,
 		BlockHeight: in.Height,
-		Shares:      ipld.ProtoToShare(in.Shares),
+		Shares:      share.ProtoToShare(in.Shares),
 		Index:       in.Index,
 		Axis:        rsmt2d.Axis(in.Axis),
 	}
@@ -141,7 +140,7 @@ func (p *BadEncodingProof) Validate(header *header.ExtendedHeader) error {
 			continue
 		}
 		shares[index] = share.Share
-		if ok := share.Validate(plugin.MustCidFromNamespacedSha256(root)); !ok {
+		if ok := share.Validate(ipld.MustCidFromNamespacedSha256(root)); !ok {
 			return fmt.Errorf("fraud: invalid proof: incorrect share received at index %d", index)
 		}
 	}

diff --git a/fraud/bad_encoding_test.go b/fraud/bad_encoding_test.go
@@ -9,7 +9,7 @@ import (
 	mdutils "github.com/ipfs/go-merkledag/test"
 	"github.com/stretchr/testify/require"
 
-	"github.com/celestiaorg/celestia-node/ipld"
+	"github.com/celestiaorg/celestia-node/share"
 )
 
 func TestFraudProofValidation(t *testing.T) {
@@ -21,7 +21,7 @@ func TestFraudProofValidation(t *testing.T) {
 	require.NoError(t, err)
 
 	faultDAH, err := generateByzantineError(ctx, t, h, bServ)
-	var errByz *ipld.ErrByzantine
+	var errByz *share.ErrByzantine
 	require.True(t, errors.As(err, &errByz))
 	p := CreateBadEncodingProof([]byte("hash"), uint64(faultDAH.Height), errByz)
 	err = p.Validate(faultDAH)

diff --git a/fraud/pb/proof.pb.go b/fraud/pb/proof.pb.go
diff --git a/fraud/testing.go b/fraud/testing.go
@@ -6,10 +6,11 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/celestiaorg/celestia-node/share/eds"
+
 	"github.com/ipfs/go-blockservice"
 
 	"github.com/celestiaorg/celestia-node/header"
-	"github.com/celestiaorg/celestia-node/ipld"
 )
 
 type DummyService struct {
@@ -66,7 +67,7 @@ func generateByzantineError(
 	bServ blockservice.BlockService,
 ) (*header.ExtendedHeader, error) {
 	faultHeader := header.CreateFraudExtHeader(t, h, bServ)
-	rtrv := ipld.NewRetriever(bServ)
+	rtrv := eds.NewRetriever(bServ)
 	_, err := rtrv.Retrieve(ctx, faultHeader.DAH)
 	return faultHeader, err
 }