-
Notifications
You must be signed in to change notification settings - Fork 316
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: refactor share splitting and merging (#637)
* chore: refactor share splitting and merging * chore: address feedback from #820 * linter * Apply suggestions from code review Co-authored-by: Rootul Patel <[email protected]> * remove unused code * linter * chore: change fields for sharestack to be more accurate * add comment to old implementation * review feedback * rename power of two util * Apply suggestions from code review review feedback Co-authored-by: Rootul Patel <[email protected]> Co-authored-by: Rootul Patel <[email protected]>
- Loading branch information
1 parent
05bdf9e
commit 13076a6
Showing
21 changed files
with
979 additions
and
839 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package appconsts | ||
|
|
||
| import ( | ||
| "bytes" | ||
|
|
||
| "github.com/tendermint/tendermint/pkg/consts" | ||
| ) | ||
|
|
||
| var NameSpacedPaddedShareBytes = bytes.Repeat([]byte{0}, consts.MsgShareSize) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package shares | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/tendermint/tendermint/pkg/consts" | ||
| coretypes "github.com/tendermint/tendermint/types" | ||
| ) | ||
|
|
||
| func TestContigShareWriter(t *testing.T) { | ||
| // note that this test is mainly for debugging purposes, the main round trip | ||
| // tests occur in TestMerge and Test_processContiguousShares | ||
| w := NewContiguousShareSplitter(consts.TxNamespaceID) | ||
| txs := generateRandomContiguousShares(33, 200) | ||
| for _, tx := range txs { | ||
| rawTx, _ := tx.MarshalDelimited() | ||
| w.WriteBytes(rawTx) | ||
| } | ||
| resShares := w.Export() | ||
| rawResTxs, err := processContiguousShares(resShares.RawShares()) | ||
| resTxs := coretypes.ToTxs(rawResTxs) | ||
| require.NoError(t, err) | ||
|
|
||
| assert.Equal(t, txs, resTxs) | ||
| } | ||
|
|
||
| func Test_parseDelimiter(t *testing.T) { | ||
| for i := uint64(0); i < 100; i++ { | ||
| tx := generateRandomContiguousShares(1, int(i))[0] | ||
| input, err := tx.MarshalDelimited() | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| res, txLen, err := ParseDelimiter(input) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| assert.Equal(t, i, txLen) | ||
| assert.Equal(t, []byte(tx), res) | ||
| } | ||
| } | ||
|
|
||
| func TestFuzz_processContiguousShares(t *testing.T) { | ||
| t.Skip() | ||
| // run random shares through processContiguousShares for a minute | ||
| ctx, cancel := context.WithTimeout(context.Background(), time.Minute) | ||
| defer cancel() | ||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return | ||
| default: | ||
| Test_processContiguousShares(t) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func Test_processContiguousShares(t *testing.T) { | ||
| // exactTxShareSize is the length of tx that will fit exactly into a single | ||
| // share, accounting for namespace id and the length delimiter prepended to | ||
| // each tx | ||
| const exactTxShareSize = consts.TxShareSize - 1 | ||
|
|
||
| type test struct { | ||
| name string | ||
| txSize int | ||
| txCount int | ||
| } | ||
|
|
||
| // each test is ran twice, once using txSize as an exact size, and again | ||
| // using it as a cap for randomly sized txs | ||
| tests := []test{ | ||
| {"single small tx", 10, 1}, | ||
| {"many small txs", 10, 10}, | ||
| {"single big tx", 1000, 1}, | ||
| {"many big txs", 1000, 10}, | ||
| {"single exact size tx", exactTxShareSize, 1}, | ||
| {"many exact size txs", exactTxShareSize, 10}, | ||
| } | ||
|
|
||
| for _, tc := range tests { | ||
| tc := tc | ||
|
|
||
| // run the tests with identically sized txs | ||
| t.Run(fmt.Sprintf("%s idendically sized ", tc.name), func(t *testing.T) { | ||
| txs := generateRandomContiguousShares(tc.txCount, tc.txSize) | ||
|
|
||
| shares := SplitTxs(txs) | ||
|
|
||
| parsedTxs, err := processContiguousShares(shares) | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
|
|
||
| // check that the data parsed is identical | ||
| for i := 0; i < len(txs); i++ { | ||
| assert.Equal(t, []byte(txs[i]), parsedTxs[i]) | ||
| } | ||
| }) | ||
|
|
||
| // run the same tests using randomly sized txs with caps of tc.txSize | ||
| t.Run(fmt.Sprintf("%s randomly sized", tc.name), func(t *testing.T) { | ||
| txs := generateRandomlySizedContiguousShares(tc.txCount, tc.txSize) | ||
|
|
||
| shares := SplitTxs(txs) | ||
|
|
||
| parsedTxs, err := processContiguousShares(shares) | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
|
|
||
| // check that the data parsed is identical to the original | ||
| for i := 0; i < len(txs); i++ { | ||
| assert.Equal(t, []byte(txs[i]), parsedTxs[i]) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.