refactor(share): GetShare -> GetSamples #3905
Conversation
| @@ -904,7 +915,7 @@ func createService(ctx context.Context, t testing.TB, shares []libshare.Share) * | |||
| }) | |||
| shareGetter.EXPECT().GetSamples(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes(). | |||
| DoAndReturn(func(ctx context.Context, h *header.ExtendedHeader, indices []shwap.SampleIndex) ([]shwap.Sample, error) { | |||
| return smpls, nil | |||
| return []shwap.Sample{}, nil | |||
There was a problem hiding this comment.
No idea what should be here.
| require.NoError(t, err) | ||
|
|
||
| assert.Equal(t, sh, resultShares[shareOffset]) | ||
| assert.Equal(t, smpls[0].Share, resultShares[shareOffset]) |
There was a problem hiding this comment.
Should it be always [0] or somethings else? idx ?
| smpls, err := service.shareGetter.GetSamples(ctx, h, []shwap.SampleIndex{idx}) | ||
| require.NoError(t, err) | ||
|
|
||
| assert.Equal(t, smpls[0].Share, resultShares[shareOffset], fmt.Sprintf("issue on %d attempt", i)) |
There was a problem hiding this comment.
Should it be always [0] or somethings else? idx ?
| require.NoError(t, err) | ||
|
|
||
| assert.Equal(t, sh, resultShares[0]) | ||
| assert.Equal(t, smpls[0].Share, resultShares[0]) |
There was a problem hiding this comment.
Should it be always [0] or somethings else? idx ?
| require.True(t, bytes.Equal(sh.ToBytes(), resultShares[shareOffset].ToBytes()), | ||
| smpls, err := service.shareGetter.GetSamples(ctx, h, []shwap.SampleIndex{idx}) | ||
| require.NoError(t, err) | ||
| require.True(t, bytes.Equal(smpls[0].Share.ToBytes(), resultShares[shareOffset].ToBytes()), |
There was a problem hiding this comment.
Should it be always [0] or somethings else? idx ?
| @@ -86,7 +86,7 @@ func (sb *SampleBlock) Marshal() ([]byte, error) { | |||
| } | |||
|
|
|||
| func (sb *SampleBlock) Populate(ctx context.Context, eds eds.Accessor) error { | |||
| smpl, err := eds.Sample(ctx, sb.ID.RowIndex, sb.ID.ShareIndex) | |||
| smpl, err := eds.Sample(ctx, shwap.SampleIndex(sb.ID.ShareIndex)) | |||
There was a problem hiding this comment.
Can you elaborate?
There was a problem hiding this comment.
The data structure we work with is a table of Rows and Columns. Cells in the table are called shares. Every share can be addressed by coordinates or index. Coordinate in 2D space and index in 1D vector space.
In this case ShareIndex is ColumnIndex(I know it might be confusing in this context), so
(RowIndex; ShareIndex) is a coordinate.
SampleIndex is an index in 1D space, so we cant use ShareIndex ad SampleIndex.
P.S. Sample is Share + Proof, so in the context of positiom Share and Sample can be used interchangeably.
| rowIdx, colIdx, err := idx.Coordinates(shwap.EdsIDSize) | ||
| if err != nil { | ||
| return shwap.Sample{}, err | ||
| } | ||
| return eds.SampleForProofAxis(rowIdx, colIdx, rsmt2d.Row) |
There was a problem hiding this comment.
We should use the SampleIndex here as well. The objective is to use a single type everywhere
There was a problem hiding this comment.
Ok, SampleForProofAxis is now:
func (eds *Rsmt2D) SampleForProofAxis(
idx shwap.SampleIndex,
proofType rsmt2d.Axis,
) (shwap.Sample, error) {
| axisType, axisIdx := rsmt2d.Row, 0 // rowIdx, colIdx | ||
| // if colIdx < o.size()/2 && rowIdx >= o.size()/2 { | ||
| // axisType, axisIdx, shrIdx = rsmt2d.Col, colIdx, rowIdx | ||
| // } |
There was a problem hiding this comment.
we still need to swap coordinates here.
There was a problem hiding this comment.
Looks like we don't need rowIdx, colIdx (idx is enough here). The only question I have is: how to get from SampleIndex which axis do we want?
Continuation for #3891