Skip to content

fix out flag #345

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

Draft
Unheilbar wants to merge 1 commit into
base: solana-bindings-write-report-only
Choose a base branch
from
+40 −2
Draft

fix out flag #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions cmd/generate-bindings/solana/solana.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,11 @@ func (h *handler) ResolveInputs(v *viper.Viper) (Inputs, error) {
idlPath = filepath.Join(projectRoot, "contracts", "solana", "src", "idl")
}

// Output path is contracts/{chainFamily}/src/generated/ under projectRoot
outPath := filepath.Join(projectRoot, "contracts", "solana", "src", "generated")
// Resolve output path with fallback to contracts/solana/src/generated/
outPath := v.GetString("out")
if outPath == "" {
outPath = filepath.Join(projectRoot, "contracts", "solana", "src", "generated")
}

return Inputs{
ProjectRoot: projectRoot,
Expand Down
35 changes: 35 additions & 0 deletions cmd/generate-bindings/solana/solana_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,41 @@ func TestResolveSolanaInputs_DefaultFallbacks(t *testing.T) {
assert.Equal(t, expectedOut, actualOut)
}

func TestResolveSolanaInputs_CustomOutPath(t *testing.T) {
tempDir, err := os.MkdirTemp("", "generate-bindings-test")
require.NoError(t, err)
defer os.RemoveAll(tempDir)

contractsDir := filepath.Join(tempDir, "contracts")
err = os.MkdirAll(contractsDir, 0755)
require.NoError(t, err)

originalDir, err := os.Getwd()
require.NoError(t, err)
defer func() {
if err := os.Chdir(originalDir); err != nil {
t.Errorf("Failed to restore original directory: %v", err)
}
}()

err = os.Chdir(tempDir)
require.NoError(t, err)

customOut := filepath.Join(tempDir, "my-custom-output")

v := viper.New()
v.Set("language", "go")
v.Set("out", customOut)

runtimeCtx := &runtime.Context{}
handler := newHandler(runtimeCtx)

inputs, err := handler.ResolveInputs(v)
require.NoError(t, err)

assert.Equal(t, customOut, inputs.OutPath)
}

func TestProcessSolanaSingleIdl(t *testing.T) {
// Create a temporary directory structure
tempDir, err := os.MkdirTemp("", "generate-bindings-test")
Expand Down