Merge pull request #2924 from ProvableHQ/reduce-test-heights

Reduce the test consensus version heights

Author: vicsn

console/network/src/consensus_heights.rs

@@ -100,16 +100,16 @@ pub const TESTNET_V0_CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); NUM_CO
 /// The consensus version heights when the `test_consensus_heights` feature is enabled.
 pub const TEST_CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); NUM_CONSENSUS_VERSIONS] = [
     (ConsensusVersion::V1, 0),
-    (ConsensusVersion::V2, 10),
-    (ConsensusVersion::V3, 11),
-    (ConsensusVersion::V4, 12),
-    (ConsensusVersion::V5, 13),
-    (ConsensusVersion::V6, 14),
-    (ConsensusVersion::V7, 15),
-    (ConsensusVersion::V8, 16),
-    (ConsensusVersion::V9, 17),
-    (ConsensusVersion::V10, 18),
-    (ConsensusVersion::V11, 19),
+    (ConsensusVersion::V2, 5),
+    (ConsensusVersion::V3, 6),
+    (ConsensusVersion::V4, 7),
+    (ConsensusVersion::V5, 8),
+    (ConsensusVersion::V6, 9),
+    (ConsensusVersion::V7, 10),
+    (ConsensusVersion::V8, 11),
+    (ConsensusVersion::V9, 12),
+    (ConsensusVersion::V10, 13),
+    (ConsensusVersion::V11, 14),
 ];
 
 #[cfg(any(test, feature = "test", feature = "test_consensus_heights"))]

synthesizer/src/vm/tests/test_v9.rs

@@ -2466,7 +2466,7 @@ program upgradable.aleo;
 function foo:
 constructor:
     branch.eq edition 0u16 to end;
-    gte block.height 20u32 into r0;
+    gte block.height 15u32 into r0;
     assert.eq r0 true;
     position end;
     ",
@@ -2479,7 +2479,7 @@ function foo:
 function bar:
 constructor:
     branch.eq edition 0u16 to end;
-    gte block.height 20u32 into r0;
+    gte block.height 15u32 into r0;
     assert.eq r0 true;
     position end;
     ",
@@ -2488,25 +2488,25 @@ constructor:
     // Deploy the first version of the program.
     let transaction = vm.deploy(&caller_private_key, &program_v0, None, 0, None, rng)?;
     let block = sample_next_block(&vm, &caller_private_key, &[transaction], rng).unwrap();
-    assert_eq!(block.height(), 18);
+    assert_eq!(block.height(), 13);
     assert_eq!(block.transactions().num_accepted(), 1);
     assert_eq!(block.transactions().num_rejected(), 0);
     assert_eq!(block.aborted_transaction_ids().len(), 0);
     vm.add_next_block(&block)?;
 
-    // Attempt to deploy the second version of the program before block height 20.
+    // Attempt to deploy the second version of the program before block height 15.
     let transaction = vm.deploy(&caller_private_key, &program_v1, None, 0, None, rng)?;
     let block = sample_next_block(&vm, &caller_private_key, &[transaction], rng)?;
-    assert_eq!(block.height(), 19);
+    assert_eq!(block.height(), 14);
     assert_eq!(block.transactions().num_accepted(), 0);
     assert_eq!(block.transactions().num_rejected(), 1);
     assert_eq!(block.aborted_transaction_ids().len(), 0);
     vm.add_next_block(&block)?;
 
-    // Attempt to deploy the second version of the program at block height 20.
+    // Attempt to deploy the second version of the program at block height 15.
     let transaction = vm.deploy(&caller_private_key, &program_v1, None, 0, None, rng)?;
     let block = sample_next_block(&vm, &caller_private_key, &[transaction], rng)?;
-    assert_eq!(block.height(), 20);
+    assert_eq!(block.height(), 15);
     assert_eq!(block.transactions().num_accepted(), 1);
     assert_eq!(block.transactions().num_rejected(), 0);
     assert_eq!(block.aborted_transaction_ids().len(), 0);

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

@@ -4,15 +4,15 @@ outputs:
   execute:
     arrays_in_finalize.aleo/test_arrays:
       outputs:
-      - '{"type":"public","id":"998749199777167634896325369380527639704326551183747142782934531339144925530field","value":"[\n  [\n    true,\n    false,\n    true,\n    false\n  ]\n]"}'
-      - '{"type":"public","id":"585431494735788072170863910140221654224826896271206703408135790476336580449field","value":"[\n  [\n    false,\n    true,\n    false,\n    true\n  ]\n]"}'
-      - '{"type":"public","id":"724249684219407361738510177189706738154847641349019655360703075953798486087field","value":"[\n  [\n    false,\n    false,\n    false,\n    false\n  ]\n]"}'
-      - '{"type":"private","id":"935952055735684080496891614875475220205878379557005136281900117326329551266field","value":"ciphertext1qvqpg2wxwnq6nzya4mwqu2l9rz6ye3zkpmlm8l063qpyu3uz56jwjrmv977a3qcje8ruuuc4g0wq6nnzheul29tk7x2zlvn8ccgs0tk6qr7t7kr7vzl3lwflvhchttjpcqrhlsmv9js85kue3d73w43qnz6skhhw9qp"}'
-      - '{"type":"future","id":"634242531938966458078390077037979581839450552635037446155410252463433306053field","value":"{\n  program_id: arrays_in_finalize.aleo,\n  function_name: test_arrays,\n  arguments: [\n    [\n  [\n    true,\n    false,\n    true,\n    false\n  ]\n],\n    [\n  [\n    false,\n    true,\n    false,\n    true\n  ]\n]\n  ]\n}"}'
+      - '{"type":"public","id":"542740221275968686801342469669124764097724959878850998397230497919098355925field","value":"[\n  [\n    true,\n    false,\n    true,\n    false\n  ]\n]"}'
+      - '{"type":"public","id":"5693312308080591598728679767826096154528132968509424395595218800740940243342field","value":"[\n  [\n    false,\n    true,\n    false,\n    true\n  ]\n]"}'
+      - '{"type":"public","id":"3368119257775272893216890765645856169324252349502685704961269505781015331585field","value":"[\n  [\n    false,\n    false,\n    false,\n    false\n  ]\n]"}'
+      - '{"type":"private","id":"6495332843381545741405892949032231642715412256962781728616191975309898905132field","value":"ciphertext1qvq9cur3udej4zzqdk8997v905tknug9z7y60kcp34a3j0asz9v6kzmnvwps6f70a7e0jnpr7wqj4f2srascuw9s79nem06c87nveafeqfm24n9vpmg8522rwjy4p6n0wrfllau6ecd0avsyvpme4whr72fpz2z9kkk"}'
+      - '{"type":"future","id":"4347550098954990697084329914675595931685052424821242629209717485789791942730field","value":"{\n  program_id: arrays_in_finalize.aleo,\n  function_name: test_arrays,\n  arguments: [\n    [\n  [\n    true,\n    false,\n    true,\n    false\n  ]\n],\n    [\n  [\n    false,\n    true,\n    false,\n    true\n  ]\n]\n  ]\n}"}'
   speculate: the execution was accepted
   add_next_block: succeeded.
 additional:
 - child_outputs:
     credits.aleo/fee_public:
       outputs:
-      - '{"type":"future","id":"8115531054870402440333197528407424397162655555531262676466216421547911202650field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo1y9t0y4lvhm43qdzlfjmfzh8985vfnx9ms368p07x5lsemet5ey8qt0ssjn,\n    1999u64\n  ]\n}"}'
+      - '{"type":"future","id":"8406231453454693587142060195183081734288813524805237835079349128431018845774field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo1y9t0y4lvhm43qdzlfjmfzh8985vfnx9ms368p07x5lsemet5ey8qt0ssjn,\n    1999u64\n  ]\n}"}'

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

@@ -4,35 +4,35 @@ outputs:
   execute:
     branch_with_future.aleo/bar:
       outputs:
-      - '{"type":"future","id":"7288896262197555662761828224784237732052643111617430351902245259912426045153field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: bar,\n  arguments: [\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        false\n      ]\n    }\n  \n  ]\n}"}'
+      - '{"type":"future","id":"7973646270430063562373513285442797277543538404623747447923720508256936178352field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: bar,\n  arguments: [\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        false\n      ]\n    }\n  \n  ]\n}"}'
   speculate: the execution was rejected
   add_next_block: succeeded.
 - verified: true
   execute:
     branch_with_future.aleo/baz:
       outputs:
-      - '{"type":"future","id":"5806477145193618952034600457237812348092143858510492661939113854850409996229field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: baz,\n  arguments: [\n    true,\n    true,\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    },\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    }\n  \n  ]\n}"}'
+      - '{"type":"future","id":"6217861816055521818360298370891282214244329218509041907844747647593898694072field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: baz,\n  arguments: [\n    true,\n    true,\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    },\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    }\n  \n  ]\n}"}'
   speculate: the execution was accepted
   add_next_block: succeeded.
 - verified: true
   execute:
     branch_with_future.aleo/baz:
       outputs:
-      - '{"type":"future","id":"7732375940496493246688248523070942096820081079976270457877521706188569226003field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: baz,\n  arguments: [\n    true,\n    false,\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    },\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    }\n  \n  ]\n}"}'
+      - '{"type":"future","id":"6818446530611738476418477207613652616986018798349107220359971960836697161616field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: baz,\n  arguments: [\n    true,\n    false,\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    },\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    }\n  \n  ]\n}"}'
   speculate: the execution was rejected
   add_next_block: succeeded.
 - verified: true
   execute:
     branch_with_future.aleo/baz:
       outputs:
-      - '{"type":"future","id":"3797341010947399028826908669134250682637889099379106115729247838918509639000field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: baz,\n  arguments: [\n    false,\n    true,\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    },\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    }\n  \n  ]\n}"}'
+      - '{"type":"future","id":"2742810851976685536192148443922944264384991772618508513342534601337442179351field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: baz,\n  arguments: [\n    false,\n    true,\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    },\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    }\n  \n  ]\n}"}'
   speculate: the execution was rejected
   add_next_block: succeeded.
 - verified: true
   execute:
     branch_with_future.aleo/baz:
       outputs:
-      - '{"type":"future","id":"3301904300125035229933941565784439035758619729465323436407687815452213394240field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: baz,\n  arguments: [\n    false,\n    false,\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    },\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    }\n  \n  ]\n}"}'
+      - '{"type":"future","id":"2120145657495978456586176901591611938046231283490625348949209089457418356716field","value":"{\n  program_id: branch_with_future.aleo,\n  function_name: baz,\n  arguments: [\n    false,\n    false,\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    },\n    {\n      program_id: child.aleo,\n      function_name: foo,\n      arguments: [\n        true,\n        true\n      ]\n    }\n  \n  ]\n}"}'
   speculate: the execution was accepted
   add_next_block: succeeded.
 - verified: true
@@ -46,35 +46,35 @@ additional:
 - child_outputs:
     child.aleo/foo:
       outputs:
-      - '{"type":"future","id":"5773287020931987863711575982907990779231757385847176015487407111001456625619field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    false\n  ]\n}"}'
+      - '{"type":"future","id":"6695659023260461245660727980876121602841038379245786685591077158097090530275field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    false\n  ]\n}"}'
     credits.aleo/fee_public:
       outputs:
-      - '{"type":"future","id":"4973720474738462345611543216766514739746355105837021327766777477639260491274field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2085u64\n  ]\n}"}'
+      - '{"type":"future","id":"6036913973229528143599186539517771717901352279020675483008642689588236772982field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2085u64\n  ]\n}"}'
 - child_outputs:
     child.aleo/foo:
       outputs:
-      - '{"type":"future","id":"3019211196334525216747871853398793174665544747298867841982355118657545167607field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    true\n  ]\n}"}'
+      - '{"type":"future","id":"4586523778709409442924155905128493603500929760368295973122707366965589242125field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    true\n  ]\n}"}'
     credits.aleo/fee_public:
       outputs:
-      - '{"type":"future","id":"5350348506752728668871301717990347779912802534458638654323242946949151196550field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2790u64\n  ]\n}"}'
+      - '{"type":"future","id":"5443886476956824015934901826639169187032580423641141364435972986716640984682field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2790u64\n  ]\n}"}'
 - child_outputs:
     child.aleo/foo:
       outputs:
-      - '{"type":"future","id":"1798765843712687450957314068296008203814756636507420443560370663186385670929field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    true\n  ]\n}"}'
+      - '{"type":"future","id":"92109804259069205354331464334081047745254321222298177146204123750721585119field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    true\n  ]\n}"}'
     credits.aleo/fee_public:
       outputs:
-      - '{"type":"future","id":"4168379928193683663155404306736402269523881336697067374802911574437154516123field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2790u64\n  ]\n}"}'
+      - '{"type":"future","id":"5961280847447500387587809521764832977077982270658218885156999759698731528651field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2790u64\n  ]\n}"}'
 - child_outputs:
     child.aleo/foo:
       outputs:
-      - '{"type":"future","id":"6029082698397467604081713435601004270195378865776994947121620171999227885109field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    true\n  ]\n}"}'
+      - '{"type":"future","id":"3729213581918668016170118102219307566837576360438147950629862061279735365153field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    true\n  ]\n}"}'
     credits.aleo/fee_public:
       outputs:
-      - '{"type":"future","id":"662450684780655730964584291739983308261165958143610604868350547103740158269field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2790u64\n  ]\n}"}'
+      - '{"type":"future","id":"4187820260195332838732869909023865549888110411852724047366146765083824747449field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2790u64\n  ]\n}"}'
 - child_outputs:
     child.aleo/foo:
       outputs:
-      - '{"type":"future","id":"8064123217334542965607926683353979750928224176532218151884193071858538156788field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    true\n  ]\n}"}'
+      - '{"type":"future","id":"5072823829234741286735886988284948609582329441561718875899286208361544682771field","value":"{\n  program_id: child.aleo,\n  function_name: foo,\n  arguments: [\n    true,\n    true\n  ]\n}"}'
     credits.aleo/fee_public:
       outputs:
       - '{"type":"future","id":"3198047707632949697734777377141117011192825297010133845300299020915114030161field","value":"{\n  program_id: credits.aleo,\n  function_name: fee_public,\n  arguments: [\n    aleo19f7ldyn2txn950arxwzgmd69hc92agvaavuaghq3n86fv9sq25qsuu46xk,\n    2790u64\n  ]\n}"}'