Skip to content

Keystore path helper #1779

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

Merged
connorwstein merged 1 commit into from
Jan 15, 2026
Merged

Keystore path helper #1779

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
16 changes: 15 additions & 1 deletion keystore/keystore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,20 @@ func (k KeyPath) Base() string {
return k[len(k)-1]
}

// HasPrefix returns true if k starts with the given prefix path.
// For example, KeyPath{"solana", "tx", "my-key"}.HasPrefix(KeyPath{"solana", "tx"}) returns true.
func (k KeyPath) HasPrefix(prefix KeyPath) bool {
if len(prefix) > len(k) {
return false
}
for i := range prefix {
if k[i] != prefix[i] {
return false
}
}
return true
}

func NewKeyPath(segments ...string) KeyPath {
return segments
}
Expand All @@ -44,7 +58,7 @@ func NewKeyPathFromString(fullName string) KeyPath {
}

// joinKeySegments joins path-like key name segments using "/" and avoids double slashes.
// Empty segments are skipped so joinKeySegments("EVM", "TX", "my-key") => "EVM/TX/my-key".
// Empty segments are skipped so joinKeySegments("evm", "tx", "my-key") => "evm/tx/my-key".
func joinKeySegments(segments ...string) string {
cleaned := make([]string, 0, len(segments))
for _, s := range segments {
Expand Down
34 changes: 25 additions & 9 deletions keystore/keystore_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,33 @@ func TestJoinKeySegments(t *testing.T) {
segments []string
expected string
}{
{segments: []string{"EVM", "TX", "my-key"}, expected: "EVM/TX/my-key"},
{segments: []string{"EVM", "/TX", "my-key"}, expected: "EVM/TX/my-key"},
{segments: []string{"EVM", "TX/", "my-key"}, expected: "EVM/TX/my-key"},
{segments: []string{"EVM", "TX", "/my-key"}, expected: "EVM/TX/my-key"},
{segments: []string{"EVM", "TX", "my-key", ""}, expected: "EVM/TX/my-key"},
{segments: []string{"EVM", "TX", "my-key", "/"}, expected: "EVM/TX/my-key"},
{segments: []string{"EVM", "TX", "my-key", "//"}, expected: "EVM/TX/my-key"},
{segments: []string{"EVM", "TX", "my-key", "///"}, expected: "EVM/TX/my-key"},
{segments: []string{"EVM", "TX", "my-key", "////"}, expected: "EVM/TX/my-key"},
{segments: []string{"evm", "tx", "my-key"}, expected: "evm/tx/my-key"},
Copy link
Copy Markdown
Contributor Author

@connorwstein connorwstein Jan 15, 2026

Choose a reason for hiding this comment

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

lowercasing just for consistency with https://github.com/smartcontractkit/chainlink-evm/blob/develop/pkg/keys/v2/evm_tx.go#L19

{segments: []string{"evm", "/tx", "my-key"}, expected: "evm/tx/my-key"},
{segments: []string{"evm", "tx/", "my-key"}, expected: "evm/tx/my-key"},
{segments: []string{"evm", "tx", "/my-key"}, expected: "evm/tx/my-key"},
{segments: []string{"evm", "tx", "my-key", ""}, expected: "evm/tx/my-key"},
{segments: []string{"evm", "tx", "my-key", "/"}, expected: "evm/tx/my-key"},
{segments: []string{"evm", "tx", "my-key", "//"}, expected: "evm/tx/my-key"},
{segments: []string{"evm", "tx", "my-key", "///"}, expected: "evm/tx/my-key"},
{segments: []string{"evm", "tx", "my-key", "////"}, expected: "evm/tx/my-key"},
}
for _, tt := range tests {
require.Equal(t, tt.expected, joinKeySegments(tt.segments...))
}
}

func TestKeyPathHasPrefix(t *testing.T) {
tests := []struct {
path KeyPath
prefix KeyPath
expected bool
}{
{path: KeyPath{"evm", "tx", "my-key"}, prefix: KeyPath{"evm", "tx"}, expected: true},
{path: KeyPath{"evm", "tx", "my-key"}, prefix: KeyPath{"evm"}, expected: true},
{path: KeyPath{"evm", "tx", "my-key"}, prefix: KeyPath{"evm", "tx", "my-key"}, expected: true},
{path: KeyPath{"evm", "tx", "my-key"}, prefix: KeyPath{"evm", "tx", "my-key", "extra"}, expected: false},
}
for _, tt := range tests {
require.Equal(t, tt.expected, tt.path.HasPrefix(tt.prefix))
}
}
Loading