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

Fix split validation #2568

Merged
merged 8 commits into from
Aug 12, 2024
Merged

Fix split validation #2568

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a40b91
fix validation client url scheme test
tsahee Aug 9, 2024
aeddc23
remove debug prints
tsahee Aug 9, 2024
a20aa41
split-val-entry uses websocket
tsahee Aug 9, 2024
c7059a3
validation_client: connect to pre-stylus
tsahee Aug 10, 2024
3b339c9
block_validator: allow empty url
tsahee Aug 12, 2024
4881058
validation_client: only allow skipping stylus for non_existent method
tsahee Aug 12, 2024
44a4107
validation client: use errors.As
tsahee Aug 12, 2024
42af089
Merge branch 'master' into fix-split-val
PlasmaPower Aug 12, 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
19 changes: 10 additions & 9 deletions validator/client/validation_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,17 @@ func (c *ValidationClient) Start(ctx context.Context) error {
return errors.New("couldn't read name from server")
}
var stylusArchs []string
if err := c.client.CallContext(ctx, &stylusArchs, server_api.Namespace+"_stylusArchs"); err != nil {
return err
}
if len(stylusArchs) == 0 {
return fmt.Errorf("could not read stylus archs from validation server")
}
for _, stylusArch := range stylusArchs {
if stylusArch != "wavm" && stylusArch != runtime.GOARCH && stylusArch != "mock" {
return fmt.Errorf("unsupported stylus architecture: %v", stylusArch)
if err := c.client.CallContext(ctx, &stylusArchs, server_api.Namespace+"_stylusArchs"); err == nil {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd favor checking the error message here to prevent network errors from being caught here. In fact, I think we can probably downcast this into a type with the JSON-RPC error code, and there's a specific error code for a method not existing.

if len(stylusArchs) == 0 {
return fmt.Errorf("could not read stylus archs from validation server")
}
for _, stylusArch := range stylusArchs {
if stylusArch != "wavm" && stylusArch != runtime.GOARCH && stylusArch != "mock" {
return fmt.Errorf("unsupported stylus architecture: %v", stylusArch)
}
}
} else {
stylusArchs = []string{"pre-stylus"} // validation does not support stylus
}
var moduleRoots []common.Hash
if err := c.client.CallContext(ctx, &moduleRoots, server_api.Namespace+"_wasmModuleRoots"); err != nil {
Expand Down
Loading