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.

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: proper usage of CreateAccount RootDataDir #5284

Merged
merged 3 commits into from
Jun 5, 2024

Conversation

igor-sirotin
Copy link
Collaborator

@igor-sirotin igor-sirotin commented Jun 4, 2024

Closes #5186

  1. Deprecate CreateAccount.BackupDisabledDataDir
  2. Add CreateAccount.RootDataDir (with fallback to BackupDisabledDataDir until both clients update)
  3. Set nodeConfig.ShhextConfig.BackupDisabledDataDir to ./ by default
  4. Check for datadir existence during loadNodeConfig and stop on error
  5. Completely remove ShhextConfig.BackupDisabledDataDir. It was only used once as RootDataDir. Which was wrong and very confusing.

@status-im-auto
Copy link
Member

status-im-auto commented Jun 4, 2024

Jenkins Builds

Click to see older builds (20)
Commit #️⃣ Finished (UTC) Duration Platform Result
✖️ cb0e649 #1 2024-06-04 12:44:25 ~2 min tests 📄log
✔️ cb0e649 #1 2024-06-04 12:46:04 ~4 min linux 📦zip
✔️ cb0e649 #1 2024-06-04 12:47:07 ~5 min ios 📦zip
✔️ cb0e649 #1 2024-06-04 12:47:49 ~6 min android 📦aar
✖️ 1a4543e #2 2024-06-04 13:31:11 ~1 min tests 📄log
✔️ 1a4543e #2 2024-06-04 13:32:10 ~2 min android 📦aar
✔️ 1a4543e #2 2024-06-04 13:32:28 ~2 min linux 📦zip
✔️ 1a4543e #2 2024-06-04 13:33:42 ~3 min ios 📦zip
✔️ 697e2be #3 2024-06-04 13:37:37 ~1 min android 📦aar
✔️ 697e2be #3 2024-06-04 13:38:09 ~2 min linux 📦zip
✔️ 697e2be #3 2024-06-04 13:38:58 ~3 min ios 📦zip
✔️ 697e2be #3 2024-06-04 14:17:42 ~41 min tests 📄log
✔️ 22eec2c #4 2024-06-04 15:17:56 ~2 min android 📦aar
✔️ 22eec2c #4 2024-06-04 15:18:03 ~2 min linux 📦zip
✔️ 22eec2c #4 2024-06-04 15:19:26 ~3 min ios 📦zip
✔️ 22eec2c #4 2024-06-04 15:55:08 ~39 min tests 📄log
✔️ bdccd5d #5 2024-06-05 10:55:50 ~2 min android 📦aar
✔️ bdccd5d #5 2024-06-05 10:55:55 ~2 min linux 📦zip
✔️ bdccd5d #5 2024-06-05 10:56:53 ~3 min ios 📦zip
✔️ bdccd5d #5 2024-06-05 11:33:41 ~40 min tests 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 020d422 #6 2024-06-05 12:08:42 ~2 min linux 📦zip
✔️ 020d422 #6 2024-06-05 12:08:45 ~2 min android 📦aar
✔️ 020d422 #6 2024-06-05 12:09:31 ~3 min ios 📦zip
✔️ 020d422 #6 2024-06-05 12:46:36 ~40 min tests 📄log

@igor-sirotin igor-sirotin force-pushed the fix/create-account-root-data-dir branch from 1a4543e to 697e2be Compare June 4, 2024 13:35
@pavloburykh
Copy link

pavloburykh commented Jun 4, 2024

Hey @igor-sirotin! Thanx for the PR. Could you please clarify, does this branch still valid #5255 or we should continue testing this new branch? Seems both branches a linked to the same issue #5186

@igor-sirotin
Copy link
Collaborator Author

@pavloburykh sorry for confusing. I closed #5284 now.
I probably should've just kept the work in that PR, but did want to keep them separate. No idea what for 😄

@igor-sirotin igor-sirotin changed the title Fix/create account root data dir fix: proper usage of CreateAccount RootDataDir Jun 4, 2024
@pavloburykh
Copy link

@pavloburykh sorry for confusing. I closed #5284 now. I probably should've just kept the work in that PR, but did want to keep them separate. No idea what for 😄

no worries, thank you for clarification @igor-sirotin

Copy link

@Seitseman Seitseman left a comment

Choose a reason for hiding this comment

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

LGTM!

@pavloburykh
Copy link

@igor-sirotin thanks for the PR, no issues from mobile side. Tested in status-im/status-mobile#20316

What has been tested:

  1. Migration
  2. Create/restore/login
  3. local pairing
  4. verified this ISSUE is fixed on IOS

@igor-sirotin igor-sirotin force-pushed the fix/create-account-root-data-dir branch from 22eec2c to bdccd5d Compare June 5, 2024 10:52
@igor-sirotin igor-sirotin force-pushed the fix/create-account-root-data-dir branch from bdccd5d to 020d422 Compare June 5, 2024 12:05
@igor-sirotin igor-sirotin merged commit a01ffdb into develop Jun 5, 2024
10 checks passed
@igor-sirotin igor-sirotin deleted the fix/create-account-root-data-dir branch June 5, 2024 13:03
igor-sirotin added a commit that referenced this pull request Jun 5, 2024
* fix_: introduce CreateAccount.RootDataDir
* fix_: deprecate and remove ShhextConfig.BackupDisabledDataDir
igor-sirotin added a commit that referenced this pull request Jun 5, 2024
* fix_: introduce CreateAccount.RootDataDir
* fix_: deprecate and remove ShhextConfig.BackupDisabledDataDir
jo-mut pushed a commit that referenced this pull request Jun 5, 2024
* fix_: introduce CreateAccount.RootDataDir
* fix_: deprecate and remove ShhextConfig.BackupDisabledDataDir
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Cannot login on Windows
5 participants