resolve conflicts

share/eds/edstest/testing.go

@@ -39,5 +39,7 @@ func RandEDSWithNamespace(
  shares := sharetest.RandSharesWithNamespace(t, namespace, size*size)
  eds, err := rsmt2d.ComputeExtendedDataSquare(shares, share.DefaultRSMT2DCodec(), wrapper.NewConstructor(uint64(size)))
  require.NoError(t, err, "failure to recompute the extended data square")
- return eds, da.NewDataAvailabilityHeader(eds)
+ dah, err := da.NewDataAvailabilityHeader(eds)
+ require.NoError(t, err)
+ return eds, dah
 }

share/getters/shrex_test.go

@@ -1,11 +1,12 @@
 package getters
 
 import (
+ "bytes"
  "context"
- "math/rand"
- "sort"
  "encoding/binary"
  "errors"
+ "math/rand"
+ "sort"
  "testing"
  "time"
 
@@ -19,6 +20,7 @@ import (
  "github.com/stretchr/testify/require"
 
  "github.com/celestiaorg/celestia-app/pkg/da"
+ "github.com/celestiaorg/celestia-app/pkg/wrapper"
  libhead "github.com/celestiaorg/go-header"
  "github.com/celestiaorg/nmt"
  "github.com/celestiaorg/rsmt2d"
@@ -390,5 +392,7 @@ func singleNamespaceEds(
  sort.Slice(shares, func(i, j int) bool { return bytes.Compare(shares[i], shares[j]) < 0 })
  eds, err := rsmt2d.ComputeExtendedDataSquare(shares, share.DefaultRSMT2DCodec(), wrapper.NewConstructor(uint64(size)))
  require.NoError(t, err, "failure to recompute the extended data square")
- return eds, da.NewDataAvailabilityHeader(eds)
+ dah, err := da.NewDataAvailabilityHeader(eds)
+ require.NoError(t, err)
+ return eds, dah
 }

share/p2p/shrexnd/server.go

@@ -56,7 +56,6 @@ func NewServer(params *Parameters, host host.Host, store *eds.Store, getter shar
  ctx, cancel := context.WithCancel(context.Background())
  srv.cancel = cancel
 
-
  srv.handler = srv.middleware.RateLimitHandler(srv.streamHandler(ctx))
  return srv, nil
 }