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.

Sign up for GitHub

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

feat(pkg/std): ensure files are sorted in a MemPackage #1618

Merged
merged 19 commits into from
Mar 21, 2024
Merged

feat(pkg/std): ensure files are sorted in a MemPackage #1618

Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2fc948b
feat: init addPkg file sorting
waymobetta Feb 2, 2024
849962b
fix: undo remove Run
waymobetta Feb 2, 2024
0221f35
fix: replace slices with sort
waymobetta Feb 2, 2024
20be382
fix: comments
waymobetta Feb 2, 2024
3de3e8c
Merge branch 'master' into feat/vm-sort-addpkg
waymobetta Feb 5, 2024
a191c93
fix: refactor/optimize
waymobetta Feb 5, 2024
eccad11
Merge remote-tracking branch 'refs/remotes/origin/feat/vm-sort-addpkg…
waymobetta Feb 5, 2024
7dc76fb
fix: remove link
waymobetta Feb 6, 2024
9ee870e
fix: move sort + refactor validate
waymobetta Mar 1, 2024
3c645c1
fix: move sort + refactor validate
waymobetta Mar 1, 2024
230209f
Merge branch 'master' into feat/vm-sort-addpkg
waymobetta Mar 1, 2024
1decefc
fix: comment
waymobetta Mar 1, 2024
0cc62bd
change to checking if is sorted
thehowl Mar 20, 2024
1916871
Merge branch 'master' of github.com:gnolang/gno into feat/vm-sort-addpkg
thehowl Mar 20, 2024
731a2f9
remove unused func
thehowl Mar 20, 2024
e10e0c3
change all to errorf
thehowl Mar 20, 2024
483c662
perform check on first file, too
thehowl Mar 20, 2024
db7aca2
add test to check for failure
thehowl Mar 20, 2024
9e8b415
new test for duplicate files
thehowl Mar 20, 2024
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
10 changes: 10 additions & 0 deletions gno.land/pkg/sdk/vm/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"os"
"regexp"
"sort"
"strings"

gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
Expand Down Expand Up @@ -174,6 +175,15 @@ func (vm *VMKeeper) AddPackage(ctx sdk.Context, msg MsgAddPackage) error {
if err != nil {
return err
}

// enforce sorting msg.Files based on Go conventions for predictability
sort.Slice(
msg.Package.Files,
func(i, j int) bool {
return msg.Package.Files[i].Name < msg.Package.Files[j].Name
},
)

// Parse and run the files, construct *PV.
msgCtx := stdlibs.ExecContext{
ChainID: ctx.ChainID(),
Expand Down
Loading