Skip to content

Commit 865374a

Browse files
committed
chore: try_debug_home may resolve permissions errors by moving movement-core workspace nix shell outside of current nix shell.
1 parent 3e76709 commit 865374a

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

checks/migrator/checks/balances-equal/src/balances_equal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub mod test {
1515
// use a scope to ensure everything is dropped
1616
{
1717
// Form the migrator.
18-
let mut movement_migrator = MovementMigrator::try_temp()?;
18+
let mut movement_migrator = MovementMigrator::try_debug_home()?;
1919
movement_migrator.set_overlays(Overlays::default());
2020

2121
// Start the migrator so that it's running in the background.

checks/migrator/checks/matching-feature-flags/src/matching_feature_flags.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub mod test {
1111
#[ignore = "activate when runtime problems are solved"]
1212
async fn test_matching_feature_flags() -> Result<(), anyhow::Error> {
1313
// Form the migrator.
14-
let mut movement_migrator = MovementMigrator::try_temp()?;
14+
let mut movement_migrator = MovementMigrator::try_debug_home()?;
1515
// TODO: use `MovementMigrator::try_debug_home()`
1616
// let mut movement_migrator = MovementMigrator::try_debug_home()?;
1717
movement_migrator.set_overlays(Overlays::default());

checks/migrator/checks/pre-l1-merge/src/pre_l1_merge.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub mod test {
3131
// Create a Movement instance with the config
3232
let movement = Movement::new(
3333
movement_config.clone(),
34-
movement_core::MovementWorkspace::try_temp()?.into(),
34+
movement_core::MovementWorkspace::try_debug_home()?.into(),
3535
Overlays::default(),
3636
true,
3737
true,

checks/migrator/checks/sketchpad/src/accounts_equal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub mod test {
1515
// use a scope to ensure everything is dropped
1616
{
1717
// Form the migrator.
18-
let mut movement_migrator = MovementMigrator::try_temp()?;
18+
let mut movement_migrator = MovementMigrator::try_debug_home()?;
1919
movement_migrator.set_overlays(Overlays::default());
2020

2121
// Start the migrator so that it's running in the background.

checks/migrator/checks/transacting/src/transacting.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub mod test {
1212
#[ignore = "activate when runtime problems are solved"]
1313
async fn test_transacting() -> Result<(), anyhow::Error> {
1414
// Form the migrator.
15-
let mut movement_migrator = MovementMigrator::try_temp()?;
15+
let mut movement_migrator = MovementMigrator::try_debug_home()?;
1616
// TODO: use `MovementMigrator::try_debug_home()`
1717
// let mut movement_migrator = MovementMigrator::try_debug_home()?;
1818
movement_migrator.set_overlays(Overlays::default());

environments/core/testing/src/environment/environment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl TestingEnvironment {
2929
impl Environmentish for TestingEnvironment {
3030
async fn build_movement_migrator(&self) -> Result<MovementMigrator, EnvironmentError> {
3131
// Form the migrator.
32-
let mut movement_migrator = MovementMigrator::try_temp()
32+
let mut movement_migrator = MovementMigrator::try_debug_home()
3333
.map_err(|e| TestingEnvironmentError::Internal(e.into()))?;
3434
movement_migrator.set_overlays(Overlays::default());
3535

migration/cli/migrate-node/docs/cli/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ Usage: --environment-box.* [OPTIONS] --rest-api-url <REST_API_URL> --db-dir <DB_
145145
Options:
146146
--rest-api-url <REST_API_URL> The rest api url of the box environment
147147
--db-dir <DB_DIR> The db dir of the box environment
148-
--snapshot-dir <SNAPSHOT_DIR> Whether to isolate the box environment by snapshotting the movement runner and where to
149-
store the snapshot
148+
--snapshot-dir <SNAPSHOT_DIR> Whether to isolate the box environment by snapshotting the movement
149+
runner and where to store the snapshot
150150
-h, --help Print help (see more with '--help')
151151

152152
**Selection (3/4):** `environment-provisioner`

migration/util/migrator-types/src/migrator/movement_migrator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ mod tests {
148148

149149
#[tokio::test]
150150
async fn test_snapshot() -> Result<(), anyhow::Error> {
151-
let mut migrator = MovementMigrator::try_temp()?;
151+
let mut migrator = MovementMigrator::try_debug_home()?;
152152
migrator.set_overlays(Overlays::default());
153153

154154
let migrator_for_task = migrator.clone();

util/movement/core/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl Config {
7979
pub fn build(&self) -> Result<Movement, ConfigError> {
8080
Ok(Movement::new(
8181
self.movement_config().map_err(|e| ConfigError::Internal(e.into()))?,
82-
MovementWorkspace::try_temp()
82+
MovementWorkspace::try_debug_home()
8383
.map_err(|e| ConfigError::Internal(e.into()))?
8484
.into(),
8585
self.overlays(),

0 commit comments

Comments
 (0)