Add explicit vocabulary and named operation contexts
This commit is contained in:
@@ -4,9 +4,7 @@ use std::path::Path;
|
||||
|
||||
use wireguard_admin::app::{Application, RestartChoice, RestartStage};
|
||||
use wireguard_admin::config::{ResolvedSettings, SettingsFile};
|
||||
use wireguard_admin::domain::{
|
||||
Client, ClientAddresses, ClientStates, RuntimeObservation, Snapshot,
|
||||
};
|
||||
use wireguard_admin::domain::{ApplyStatus, Client, ClientAddresses, ClientStates, Snapshot};
|
||||
use wireguard_admin::persistence::SavedStore;
|
||||
use wireguard_admin::vault::WireGuardPrivateKey;
|
||||
|
||||
@@ -67,7 +65,7 @@ fn fixture(service: &str, timeout: u64) -> Fixture {
|
||||
}
|
||||
|
||||
fn open(fixture: &Fixture) -> Application {
|
||||
let states = ClientStates::new(Snapshot::default(), None, RuntimeObservation::Unknown)
|
||||
let states = ClientStates::new(Snapshot::default(), None, ApplyStatus::Unknown)
|
||||
.expect("empty saved states");
|
||||
Application::open(fixture.store.clone(), states).expect("open synthetic application")
|
||||
}
|
||||
@@ -121,7 +119,7 @@ fn public_restart_preview_and_cancel_preserve_draft_and_saved_files() {
|
||||
.expect("no cancellation backup")
|
||||
.is_empty()
|
||||
);
|
||||
assert_eq!(app.states().applied(), &RuntimeObservation::Unknown);
|
||||
assert_eq!(app.states().applied(), &ApplyStatus::Unknown);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -174,7 +172,7 @@ fn restore_changes_the_settings_used_by_the_next_restart_preview() {
|
||||
app.saved_bytes().settings,
|
||||
fixture.initial_settings.as_bytes()
|
||||
);
|
||||
assert_eq!(app.states().applied(), &RuntimeObservation::Unknown);
|
||||
assert_eq!(app.states().applied(), &ApplyStatus::Unknown);
|
||||
let restart = app
|
||||
.preview_restart()
|
||||
.expect("preview restored generation without invoking adapters");
|
||||
|
||||
Reference in New Issue
Block a user