Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ipld): simply rely on global rsmt2d.Codec constructor for now to avoid races #722

Merged
merged 1 commit into from
May 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fraud/bad_encoding_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestFraudProofValidation(t *testing.T) {
require.NoError(t, err)

da := da.NewDataAvailabilityHeader(attackerEDS)
r := ipld.NewRetriever(dag, consts.DefaultCodec())
r := ipld.NewRetriever(dag)
_, err = r.Retrieve(context.Background(), &da)
var errByz *ipld.ErrByzantine
require.True(t, errors.As(err, &errByz))
Expand Down
2 changes: 1 addition & 1 deletion ipld/get_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ func TestRetrieveDataFailedWithByzantineError(t *testing.T) {

// ensure we rcv an error
da := da.NewDataAvailabilityHeader(attackerEDS)
r := NewRetriever(dag, DefaultRSMT2DCodec())
r := NewRetriever(dag)
_, err = r.Retrieve(ctx, &da)
var errByz *ErrByzantine
require.ErrorAs(t, err, &errByz)
Expand Down
9 changes: 4 additions & 5 deletions ipld/retriever.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ var RetrieveQuadrantTimeout = time.Minute * 5
// Retriever randomly picks one of the data square quadrants and tries to request them one by one until it is able to
// reconstruct the whole square.
type Retriever struct {
dag format.DAGService
codec rsmt2d.Codec
dag format.DAGService
}

// NewRetriever creates a new instance of the Retriever over IPLD Service and rmst2d.Codec
func NewRetriever(dag format.DAGService, codec rsmt2d.Codec) *Retriever {
return &Retriever{dag: dag, codec: codec}
func NewRetriever(dag format.DAGService) *Retriever {
return &Retriever{dag: dag}
}

// Retrieve retrieves all the data committed to DataAvailabilityHeader.
Expand Down Expand Up @@ -136,7 +135,7 @@ func (r *Retriever) newSession(ctx context.Context, dah *da.DataAvailabilityHead
tree := wrapper.NewErasuredNamespacedMerkleTree(uint64(size)/2, nmt.NodeVisitor(adder.Visit))
return &tree
},
codec: r.codec,
codec: DefaultRSMT2DCodec(),
dah: dah,
square: make([][]byte, size*size),
}
Expand Down
2 changes: 1 addition & 1 deletion ipld/retriever_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestRetriever_Retrieve(t *testing.T) {
defer cancel()

dag := mdutils.Mock()
r := NewRetriever(dag, DefaultRSMT2DCodec())
r := NewRetriever(dag)

type test struct {
name string
Expand Down
2 changes: 1 addition & 1 deletion service/share/full_availability.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type fullAvailability struct {
// NewFullAvailability creates a new full Availability.
func NewFullAvailability(dag format.DAGService) Availability {
return &fullAvailability{
rtrv: ipld.NewRetriever(dag, ipld.DefaultRSMT2DCodec()),
rtrv: ipld.NewRetriever(dag),
}
}

Expand Down
2 changes: 1 addition & 1 deletion service/share/share.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ type Service struct {
// NewService creates new basic share.Service.
func NewService(dag format.DAGService, avail Availability) *Service {
return &Service{
rtrv: ipld.NewRetriever(dag, ipld.DefaultRSMT2DCodec()),
rtrv: ipld.NewRetriever(dag),
Availability: avail,
dag: dag,
}
Expand Down