-
Notifications
You must be signed in to change notification settings - Fork 85
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
Remove contract hex encoding #480
Open
nozim
wants to merge
7
commits into
onflow:master
Choose a base branch
from
nozim:remove-contract-hex-encoding
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7b84bf2
Re #467: Remove contract hex encoding in templates package
nozim f00d5bb
Mark unused methods as deprecated
nozim 9e0a36c
Merge branch 'master' into remove-contract-hex-encoding
nozim a82afb2
Amend the accounts test, change the required contract size limit
nozim a451742
Amend test annotation
nozim accc546
Update go deps
nozim de79a68
Merge branch 'master' into remove-contract-hex-encoding
nozim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,14 +31,12 @@ func TestCreateAccount(t *testing.T) { | |
// Converting transaction arguments to Cadence values can increase their size. | ||
// If this is not taken into account the transaction can quickly grow over the maximum transaction size limit. | ||
t.Run("Transaction should not grow uncontrollably in size", func(t *testing.T) { | ||
contractLen := 1000 | ||
contractCode := make([]byte, contractLen) | ||
|
||
testContractBody := "test contract" | ||
tx, err := templates.CreateAccount( | ||
[]*flow.AccountKey{}, | ||
[]templates.Contract{{ | ||
Name: "contract", | ||
Source: string(contractCode), | ||
Source: testContractBody, | ||
}}, | ||
flow.HexToAddress("01")) | ||
|
||
|
@@ -50,7 +48,7 @@ func TestCreateAccount(t *testing.T) { | |
argumentsSize += len(argument) | ||
} | ||
require.Less(t, txSize, 1000, "The create account script should not grow over 1kB.") | ||
require.Less(t, argumentsSize, contractLen*2+500, | ||
require.Less(t, argumentsSize, len(testContractBody)*2+500, | ||
"The create account argument size should not grow over "+ | ||
"2 times the contract code (converted to hex) + 500 bytes of extra data.") | ||
}) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think here should be fixed for non-hex case. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it already checks utf8 contract length to be below the limit. |
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This message needs updating as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated :)