Remove check for wasm limit size in state sync #1471
Merged
Conversation
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
pinosu
force-pushed
the
1467-accept_statesync_wasm_data
branch
from
24eb158 to
fab8f0e
Compare
alpe
reviewed
Jun 29, 2023
x/wasm/ioutils/ioutil.go
Outdated
|
|
||
| // UncompressWithLimit fails if wasm size exceeds the limit. | ||
| // It expects a valid gzip source to unpack or fails. See IsGzip | ||
| func UncompressWithLimit(gzipSrc []byte, limit uint64) ([]byte, error) { |
There was a problem hiding this comment.
This will break api compatibility easily. Let's keep the old name just in case. The param is self explaining
x/wasm/ioutils/ioutil.go
Outdated
| @@ -11,7 +11,21 @@ import ( | |||
| ) | |||
|
|
|||
| // Uncompress expects a valid gzip source to unpack or fails. See IsGzip | |||
| func Uncompress(gzipSrc []byte, limit uint64) ([]byte, error) { | |||
| func Uncompress(gzipSrc []byte) ([]byte, error) { | |||
There was a problem hiding this comment.
No need to copy the code. Instead of adding a new method, you can simply pass math.MaxUint as limit. This makes it also more readable on the caller, IMHO.
x/wasm/ioutils/ioutil_test.go
Outdated
| assert.Equal(t, spec.expResult, r) | ||
| }) | ||
| } | ||
| } |
There was a problem hiding this comment.
good test. But we would need one on the snapshotter to ensure a file > MaxWasmSize is accepted.
pinosu
force-pushed
the
1467-accept_statesync_wasm_data
branch
from
207d5ef to
4091868
Compare
pinosu
force-pushed
the
1467-accept_statesync_wasm_data
branch
from
4091868 to
4a6962e
Compare
alpe
approved these changes
Jul 5, 2023
x/wasm/keeper/genesis_test.go
Outdated
| @@ -133,6 +135,12 @@ func TestGenesisExportImport(t *testing.T) { | |||
| srcIT := srcCtx.KVStore(wasmKeeper.storeKey).Iterator(nil, nil) | |||
| dstIT := dstCtx.KVStore(dstKeeper.storeKey).Iterator(nil, nil) | |||
|
|
|||
| t.Cleanup(func() { | |||
| types.MaxWasmSize = 800 * 1024 | |||
There was a problem hiding this comment.
Great to do proper housekeeping here! I am a bit afraid that we will easily miss this line whenever the default would be touched in the future. Can you use a temp variable for the original value instead and then use it here?
like:
origMaxWasmSize := types.MaxWasmSize
types.MaxWasmSize = 1
...
types.MaxWasmSize = origMaxWasmSize| @@ -67,6 +67,11 @@ func TestSnapshotter(t *testing.T) { | |||
| require.NoError(t, err) | |||
| assert.NotNil(t, snapshot) | |||
|
|
|||
| types.MaxWasmSize = 1 | |||
| t.Cleanup(func() { | |||
| types.MaxWasmSize = 800 * 1024 | |||
There was a problem hiding this comment.
As commented before, please use a temp variable to not hard code the value here
Closed
mergify bot
pushed a commit
that referenced
this pull request
Jul 21, 2023
* Remove check for wasm limit size in state sync * Fix comments * Store original value in variable (cherry picked from commit 1763477) # Conflicts: # x/wasm/keeper/genesis_test.go
pinosu
added a commit
that referenced
this pull request
Jul 21, 2023
* Remove check for wasm limit size in state sync (#1471) * Remove check for wasm limit size in state sync * Fix comments * Store original value in variable (cherry picked from commit 1763477) # Conflicts: # x/wasm/keeper/genesis_test.go * Fix conflicts --------- Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: Pino' Surace <pino.surace@live.it>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #1467