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: checking for keystore file existence #2427

Merged
merged 10 commits into from
Feb 15, 2024
Merged

fix: checking for keystore file existence #2427

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
da16f76
checking for file existence and debug print
gabrielmer Feb 13, 2024
2586766
add missing and
gabrielmer Feb 13, 2024
64ef1af
remove debug logs
gabrielmer Feb 13, 2024
fcfd700
logging when keystore path is provided but file doesn't exist
gabrielmer Feb 14, 2024
ea608d7
Raising exception, added test case
gabrielmer Feb 14, 2024
194f641
refactor
gabrielmer Feb 14, 2024
dd1db79
fix spaces
gabrielmer Feb 14, 2024
d7e0047
restoring new line
gabrielmer Feb 14, 2024
85b4553
more spaces
gabrielmer Feb 14, 2024
2e92fbe
Merge branch 'master' into fix-checking-for-keystore-file
gabrielmer Feb 15, 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
3 changes: 2 additions & 1 deletion waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ else:
{.push raises: [].}

import
os,
web3,
web3/ethtypes,
eth/keys as keys,
Expand Down Expand Up @@ -622,7 +623,7 @@ method init*(g: OnchainGroupManager): Future[void] {.async.} =
g.rlnContract = some(rlnContract)
g.registryContract = some(registryContract)

if g.keystorePath.isSome() and g.keystorePassword.isSome():
if g.keystorePath.isSome() and existsFile(g.keystorePath.get()) and g.keystorePassword.isSome():
Copy link
Contributor

Choose a reason for hiding this comment

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

we probably want to have a specific error log when a path and password is provided but it doesn't exist, what do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good! Added it now :)) lmk what you think about the new version

var keystoreQuery = KeystoreMembership(
membershipContract: MembershipContract(
chainId: $g.chainId.get(),
Expand Down
Loading