fix connect chains input #494
There are no files selected for viewing
This file contains hidden or 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,56 @@ | ||
| package compile | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| ) | ||
|
|
||
| const aptosCLIEnvVar = "APTOS_CLI" | ||
|
|
||
| // resolveAptosCLI returns the Aptos Labs CLI binary used for Move compilation. | ||
| // APTOS_CLI overrides PATH lookup when set. | ||
| func resolveAptosCLI() (string, error) { | ||
| if cli := os.Getenv(aptosCLIEnvVar); cli != "" { | ||
| if err := assertExecutable(cli); err != nil { | ||
| return "", fmt.Errorf("%s=%q: %w", aptosCLIEnvVar, cli, err) | ||
| } | ||
| return cli, nil | ||
| } | ||
|
|
||
| for _, dir := range filepath.SplitList(os.Getenv("PATH")) { | ||
| if dir == "" { | ||
| continue | ||
| } | ||
| candidate := filepath.Join(dir, "aptos") | ||
| if !isAptosCLI(candidate) { | ||
| continue | ||
| } | ||
| return candidate, nil | ||
| } | ||
|
|
||
| return "", fmt.Errorf( | ||
| "aptos CLI not found on PATH; set %s to the binary path)", | ||
| aptosCLIEnvVar, | ||
| ) | ||
| } | ||
|
|
||
| func assertExecutable(path string) error { | ||
| info, err := os.Stat(path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if info.IsDir() { | ||
| return fmt.Errorf("not an executable file") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func isAptosCLI(path string) bool { | ||
| if err := assertExecutable(path); err != nil { | ||
| return false | ||
| } | ||
| cmd := exec.Command(path, "move", "--help") | ||
| return cmd.Run() == nil | ||
| } | ||
This file contains hidden or 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,73 @@ | ||
| package compile | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func writeFakeCLI(t *testing.T, dir, name string, script string) string { | ||
| t.Helper() | ||
| path := filepath.Join(dir, name) | ||
| require.NoError(t, os.WriteFile(path, []byte(script), 0o755)) | ||
| return path | ||
| } | ||
|
|
||
| func Test_resolveAptosCLI_APTOS_CLIOverride(t *testing.T) { | ||
| dir := t.TempDir() | ||
| cli := writeFakeCLI(t, dir, "aptos-labs", "#!/bin/sh\nexit 0\n") | ||
|
|
||
| t.Setenv(aptosCLIEnvVar, cli) | ||
| t.Setenv("PATH", "") | ||
|
|
||
| got, err := resolveAptosCLI() | ||
| require.NoError(t, err) | ||
| require.Equal(t, cli, got) | ||
| } | ||
|
|
||
| func Test_resolveAptosCLI_APTOS_CLIOverride_missing(t *testing.T) { | ||
| t.Setenv(aptosCLIEnvVar, filepath.Join(t.TempDir(), "missing")) | ||
| t.Setenv("PATH", "") | ||
|
|
||
| _, err := resolveAptosCLI() | ||
| require.Error(t, err) | ||
| require.Contains(t, err.Error(), aptosCLIEnvVar) | ||
| } | ||
|
|
||
| func Test_resolveAptosCLI_PATHPrefersLabsCLI(t *testing.T) { | ||
| loopOnlyDir := t.TempDir() | ||
| writeFakeCLI(t, loopOnlyDir, "aptos", "#!/bin/sh\nif [ \"$1\" = move ]; then exit 1; fi\nexit 0\n") | ||
| labsAsAptosDir := t.TempDir() | ||
| writeFakeCLI(t, labsAsAptosDir, "aptos", "#!/bin/sh\nif [ \"$1\" = move ] && [ \"$2\" = --help ]; then exit 0; fi\nexit 1\n") | ||
|
|
||
| t.Setenv(aptosCLIEnvVar, "") | ||
| t.Setenv("PATH", loopOnlyDir+string(filepath.ListSeparator)+labsAsAptosDir) | ||
|
|
||
| got, err := resolveAptosCLI() | ||
| require.NoError(t, err) | ||
| require.Equal(t, filepath.Join(labsAsAptosDir, "aptos"), got) | ||
| } | ||
|
|
||
| func Test_resolveAptosCLI_noValidCLI(t *testing.T) { | ||
| dir := t.TempDir() | ||
| writeFakeCLI(t, dir, "aptos", "#!/bin/sh\nexit 1\n") | ||
|
|
||
| t.Setenv(aptosCLIEnvVar, "") | ||
| t.Setenv("PATH", dir) | ||
|
|
||
| _, err := resolveAptosCLI() | ||
| require.Error(t, err) | ||
| require.Contains(t, err.Error(), aptosCLIEnvVar) | ||
| } | ||
|
|
||
| func Test_isAptosLabsCLI(t *testing.T) { | ||
| dir := t.TempDir() | ||
| labs := writeFakeCLI(t, dir, "labs", "#!/bin/sh\nif [ \"$1\" = move ] && [ \"$2\" = --help ]; then exit 0; fi\nexit 1\n") | ||
| loop := writeFakeCLI(t, dir, "loop", "#!/bin/sh\nif [ \"$1\" = move ]; then exit 1; fi\nexit 0\n") | ||
|
|
||
| require.True(t, isAptosCLI(labs)) | ||
| require.False(t, isAptosCLI(loop)) | ||
| require.False(t, isAptosCLI(filepath.Join(dir, "missing"))) | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
There was a collision with the
aptosrelayer binary in core e2e tests. Adding the resolver to make sureaptosbinary is actually the CLI binary