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

Jump to bottom

fix: dfx start --pocketic does not require --clean #3984

Merged
merged 4 commits into from
Nov 12, 2024
Merged

fix: dfx start --pocketic does not require --clean #3984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88b862c
fix: dfx start --pocketic does not require --clean
mraszyk Nov 12, 2024
20b05df
force
mraszyk Nov 12, 2024
4948c4e
fix
mraszyk Nov 12, 2024
9f2cbe4
Merge branch 'master' into mraszyk/pic-clean
mraszyk Nov 12, 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
8 changes: 8 additions & 0 deletions e2e/tests-dfx/start.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ teardown() {
assert_command diff "$NETWORK_ID_PATH" "$NETWORK_ID_BY_SETTINGS_DIGEST_PATH"
}

@test "start and stop" {
dfx_start
dfx_stop

dfx_start
dfx_stop
}

@test "start and stop with different options" {
[[ "$USE_POCKETIC" ]] && skip "skipped for pocketic: clean required"
dfx_start --artificial-delay 101
Expand Down
3 changes: 2 additions & 1 deletion src/dfx-core/src/config/model/replica_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ impl<'a> CachedConfig<'a> {
}
}
pub fn can_share_state(&self, other: &Self) -> bool {
self == other
// effective canister id does not matter for ability to share state
self.replica_rev == other.replica_rev && self.config == other.config
}
pub fn get_effective_canister_id(&self) -> Option<Principal> {
self.effective_canister_id
Expand Down
Loading