Add activate argument to deploy

Author: smoelius

tests/stylus.rs

@@ -110,6 +110,7 @@ fn tests(required_forbidden_pairs: &[(&[&str], &[&str])]) {
         let (tempdir, address) = match deploy(
             PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(path),
             contract,
+            true,
         ) {
             Ok((tempdir, address)) => (tempdir, address),
             Err(Error(severity, error)) => {
@@ -143,14 +144,15 @@ fn tests(required_forbidden_pairs: &[(&[&str], &[&str])]) {
     assert!(failures.is_empty());
 }
 
-fn deploy(path: impl AsRef<Path>, contract: &str) -> Result<(TempDir, String)> {
+fn deploy(path: impl AsRef<Path>, contract: &str, activate: bool) -> Result<(TempDir, String)> {
     let tempdir = tempdir().unwrap();
     let dir = &tempdir;
 
     let rust_toolchain_toml =
         PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("integration/stylus/rust-toolchain.toml");
     copy(rust_toolchain_toml, dir.path().join("rust-toolchain.toml")).unwrap();
 
+    // smoelius: Compile.
     command(
         dir,
         [
@@ -165,31 +167,26 @@ fn deploy(path: impl AsRef<Path>, contract: &str) -> Result<(TempDir, String)> {
         ],
     )?;
 
-    command(
-        dir,
-        [
-            "cargo",
-            "stylus",
-            "check",
-            &format!("--wasm-file={contract}.wasm"),
-        ],
-    )
-    .unwrap();
+    let wasm_file = format!("--wasm-file={contract}.wasm");
 
-    let stdout = command(
-        dir,
-        [
-            "cargo",
-            "stylus",
-            "deploy",
-            &format!("--wasm-file={contract}.wasm"),
-            "--endpoint=http://localhost:8547",
-            "--private-key",
-            PRIVATE_KEY,
-            "--no-verify",
-        ],
-    )
-    .unwrap();
+    // smoelius: Check.
+    command(dir, ["cargo", "stylus", "check", &wasm_file]).unwrap();
+
+    // smoelius: Deploy.
+    let mut deploy_args = vec![
+        "cargo",
+        "stylus",
+        "deploy",
+        &wasm_file,
+        "--endpoint=http://localhost:8547",
+        "--private-key",
+        PRIVATE_KEY,
+        "--no-verify",
+    ];
+    if !activate {
+        deploy_args.push("--no-activate");
+    }
+    let stdout = command(dir, deploy_args).unwrap();
 
     let address = stdout
         .lines()

tests/stylus_tests/counter.rs

@@ -19,6 +19,7 @@ fn counter() {
     let (tempdir, address) = deploy(
         PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("integration/stylus/counter.sol"),
         "Counter",
+        true,
     )
     .unwrap();
     let dir = &tempdir;

tests/stylus_tests/milestone_1.rs

@@ -15,6 +15,7 @@ fn milestone_1() {
     let (tempdir, address) = deploy(
         PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("integration/stylus/milestone_1.sol"),
         "C",
+        true,
     )
     .unwrap();
     let dir = &tempdir;

tests/stylus_tests/milestone_2.rs

@@ -15,6 +15,7 @@ fn milestone_2() {
     let (tempdir, address) = deploy(
         PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("integration/stylus/milestone_2.sol"),
         "C",
+        true,
     )
     .unwrap();
     let dir = &tempdir;

tests/stylus_tests/milestone_3.rs

@@ -16,6 +16,7 @@ fn milestone_3() {
     let (tempdir, address) = deploy(
         PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("integration/stylus/milestone_3.sol"),
         "C",
+        true,
     )
     .unwrap();
     let dir = &tempdir;

tests/stylus_tests/value.rs

@@ -15,6 +15,7 @@ fn value() {
     let (tempdir, address) = deploy(
         PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("integration/stylus/value.sol"),
         "C",
+        true,
     )
     .unwrap();
     let dir = &tempdir;