Merge pull request #3175 from ProvableHQ/fix_ci

Fix CI

Author: vicsn

.circleci/config.yml

@@ -930,7 +930,7 @@ jobs:
           timeout: 30m # test_vm_execute_and_finalize can take over 10 minutes in the current setup
           no_output_timeout: 20m
           workspace_member: snarkvm-synthesizer
-          flags: --test '*' --features test -- --test-threads=4
+          flags: --test '*' --features test,dev-print -- --test-threads=4
           cache_key_suffix: -integration
 
   synthesizer-process:
@@ -972,7 +972,7 @@ jobs:
     steps:
       - run_test:
           workspace_member: snarkvm-synthesizer-program
-          flags: keccak
+          flags: keccak -- --test-threads=4
           timeout: 30m
           no_output_timeout: 20m
           cache_key_suffix: -integration-keccak
@@ -992,7 +992,7 @@ jobs:
     steps:
       - run_test:
           workspace_member: snarkvm-synthesizer-program
-          flags: sha
+          flags: sha -- --test-threads=4
           timeout: 30m
           no_output_timeout: 20m
           cache_key_suffix: -integration-sha
@@ -1275,7 +1275,7 @@ workflows:
       or pipeline.git.branch == "canary"
       or pipeline.git.branch == "testnet"
       or pipeline.git.branch == "mainnet"
-      or pipeline.git.branch == "feat/identifier-literal"
+      or pipeline.git.branch == "fix_ci"
     jobs:
       - check-unused-dependencies # This can be cleaned up before releases
       - check-cargo-semver-checks # This can be cleaned up before releases

Cargo.lock

@@ -206,5 +206,9 @@ version = "0.9"
 [dev-dependencies.tempfile]
 workspace = true
 
+[dev-dependencies.test-log]
+version = "0.2"
+features = [ "trace" ]
+
 [dev-dependencies.walkdir]
 version = "2"

synthesizer/Cargo.toml

@@ -89,6 +89,7 @@ impl<N: Network, C: ConsensusStorage<N>> VM<N, C> {
             .filter_map(|tx_id| {
                 unordered_aborted_transaction_ids.get(&tx_id).map(|error| {
                     warn!("Speculation safely aborted a transaction - {error} ({tx_id})");
+                    dev_eprintln!("Speculation safely aborted a transaction - {error} ({tx_id})");
                     tx_id
                 })
             })

synthesizer/src/vm/finalize.rs

@@ -4,13 +4,21 @@ outputs:
   execute:
     self_caller_in_closure.aleo/dummy:
       outputs:
-      - '{"type":"private","id":"2216227416503041347433412034872956491846811102146440372685849103494739704020field","value":"ciphertext1qyqya6k83s309kj2l82tj5fr80n7e7w7t56ff72ug8ueqhqzevn2vys72rsev"}'
+      - '{"type":"private","id":"1126549371219261677622135540139100244763419767422514369520585148590831448189field","value":"ciphertext1qyqzpsfrwmgjth29h3z5kkjy4rdnx2cjuur6j2h00zvc2td3teelvrsmequh8"}'
+  speculate: the execution was accepted
+  add_next_block: succeeded.
+- verified: true
+  execute:
+    self_caller_in_closure.aleo/run_check:
+      outputs: []
   speculate: the execution was accepted
   add_next_block: succeeded.
-- execute: 'Failed to execute instruction (call check_caller self.caller;): Failed to evaluate instruction (assert.eq self.caller r0 ;): Caller address (console) is not set in the registers.'
 additional:
 - child_outputs:
     credits.aleo/fee_public:
       outputs:
-      - '{"type":"future","id":"7718771598168275830568214808516419506185731287938173896061440207543931919734field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo1gj8900ftrtm5gpjljk9tuv8tmr46m88s5dvugdx8hnmftvpfv5rqempqfd,\n    1334u64\n  ]\n}"}'
-- {}
+      - '{"type":"future","id":"494259290164722817317909876873778317197296441822796709748776683471356290260field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo1gj8900ftrtm5gpjljk9tuv8tmr46m88s5dvugdx8hnmftvpfv5rqempqfd,\n    1334u64\n  ]\n}"}'
+- child_outputs:
+    credits.aleo/fee_public:
+      outputs:
+      - '{"type":"future","id":"7125087701862650478091264713412629351672029968343630145355670167713923010292field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo1gj8900ftrtm5gpjljk9tuv8tmr46m88s5dvugdx8hnmftvpfv5rqempqfd,\n    1161u64\n  ]\n}"}'

synthesizer/tests/expectations/vm/execute_and_finalize/self_caller_and_signer_in_closure.out

@@ -48,6 +48,7 @@ type LedgerType = snarkvm_ledger_store::helpers::memory::ConsensusMemory<Current
 type LedgerType = snarkvm_ledger_store::helpers::rocksdb::ConsensusDB<CurrentNetwork>;
 
 #[test]
+#[test_log::test]
 fn test_vm_execute_and_finalize() {
     // Load the tests.
     let tests =
@@ -155,7 +156,11 @@ fn run_test(test: &ProgramTest) -> serde_yaml::Mapping {
                 rng,
             )
             .unwrap();
-        assert!(aborted_transaction_ids.is_empty());
+        if !aborted_transaction_ids.is_empty() {
+            // Print the program ID that was aborted.
+            println!("Aborted program deployment: {:?}", program.id());
+            assert!(aborted_transaction_ids.is_empty());
+        }
 
         let block = construct_next_block(
             &vm,
@@ -347,7 +352,11 @@ fn run_test(test: &ProgramTest) -> serde_yaml::Mapping {
                     return (serde_yaml::Value::Mapping(result), serde_yaml::Value::Mapping(Default::default()));
                 }
             };
-            assert!(aborted_transaction_ids.is_empty());
+            if !aborted_transaction_ids.is_empty() {
+                // Print the function that was aborted.
+                println!("Aborted call to {program_id}/{function_name}");
+                assert!(aborted_transaction_ids.is_empty());
+            }
 
             // Construct the next block.
             let block = construct_next_block(

synthesizer/tests/test_vm_execute_and_finalize.rs

@@ -28,3 +28,6 @@ function dummy:
     input r1 as u32.private;
     add r0 r1 into r2;
     output r2 as u32.private;
+
+constructor:
+    assert.eq edition 0u16;