Rebase Abstract Engine (WIP)

.gitignore

@@ -78,6 +78,7 @@ automation/*-accounts.csv
 automation/block_tree.gv.png
 automation/gcloud-keyfile.json
 automation/services/watchdog/check_libp2p/check_libp2p
+automation/testnets/
 
 *.backup
 

integration_tests/config/minimina.json

@@ -0,0 +1,79 @@
+{
+    "version": 1,
+    "actions": [
+      {
+        "name": "create_network",
+        "args": {
+          "network_id": "string",
+          "genesis_ledger": "string",
+          "topology": "string"
+        },
+        "command": "MINIMINA network create --network-id {{network_id}} --genesis-ledger {{genesis_ledger}} --topology {{topology}}"
+      },
+      {
+        "name": "start_network",
+        "args": {
+          "network_id": "string"
+        },
+        "command": "MINIMINA network start --network-id {{network_id}}"
+      },
+      {
+        "name": "delete_network",
+        "args": {
+          "network_id": "string"
+        },
+        "command": "MINIMINA network delete --network-id {{network_id}}"
+      },
+      {
+        "name": "start_node",
+        "args": {
+          "network_id": "string",
+          "node_id": "string",
+          "fresh_state": "bool"
+        },
+        "command": "MINIMINA node start {{fresh_state}} --network-id {{network_id}} --node-id {{node_id}}"
+      },
+      {
+        "name": "stop_node",
+        "args": {
+          "network_id": "string",
+          "node_id": "string"
+        },
+        "command": "MINIMINA node stop --network-id {{network_id}} --node-id {{node_id}}"
+      },
+      {
+        "name": "dump_archive_data",
+        "args": {
+          "network_id": "string",
+          "node_id": "string"
+        },
+        "command": "MINIMINA node dump-archive-data --network-id {{network_id}} --node-id {{node_id}}"
+      },
+      {
+        "name": "dump_mina_logs",
+        "args": {
+          "network_id": "string",
+          "node_id": "string"
+        },
+        "command": "MINIMINA node logs --network-id {{network_id}} --node-id {{node_id}}"
+      },
+      {
+        "name": "dump_precomputed_blocks",
+        "args": {
+          "network_id": "string",
+          "node_id": "string"
+        },
+        "command": "MINIMINA node dump-precomputed-blocks --network-id {{network_id}} --node-id {{node_id}}"
+      },
+      {
+        "name": "run_replayer",
+        "args": {
+          "network_id": "string",
+          "node_id": "string",
+          "start_slot_since_genesis": "int"
+        },
+        "command": "MINIMINA node run-replayer --network-id {{network_id}} --node-id {{node_id}} --start-slot-since-genesis {{start_slot_since_genesis}}"
+      }
+    ]
+}
+

integration_tests/config/mock.json

@@ -0,0 +1,78 @@
+{
+  "version": 1,
+  "actions": [
+    {
+      "name": "create_network",
+      "args": {
+        "network_id": "string",
+        "genesis_ledger": "string",
+        "topology": "string"
+      },
+      "command": "MOCK_NETWORK network create --network-id {{network_id}} --genesis-ledger {{genesis_ledger}} --topology {{topology}}"
+    },
+    {
+      "name": "start_network",
+      "args": {
+        "network_id": "string"
+      },
+      "command": "MOCK_NETWORK network start --network-id {{network_id}}"
+    },
+    {
+      "name": "delete_network",
+      "args": {
+        "network_id": "string"
+      },
+      "command": "MOCK_NETWORK network delete --network-id {{network_id}}"
+    },
+    {
+      "name": "start_node",
+      "args": {
+        "network_id": "string",
+        "node_id": "string",
+        "fresh_state": "bool"
+      },
+      "command": "MOCK_NETWORK node start {{fresh_state}} --network-id {{network_id}} --node-id {{node_id}}"
+    },
+    {
+      "name": "stop_node",
+      "args": {
+        "network_id": "string",
+        "node_id": "string"
+      },
+      "command": "MOCK_NETWORK node stop --network-id {{network_id}} --node-id {{node_id}}"
+    },
+    {
+      "name": "dump_archive_data",
+      "args": {
+        "network_id": "string",
+        "node_id": "string"
+      },
+      "command": "MOCK_NETWORK node dump-archive-data --network-id {{network_id}} --node-id {{node_id}}"
+    },
+    {
+      "name": "dump_mina_logs",
+      "args": {
+        "network_id": "string",
+        "node_id": "string"
+      },
+      "command": "MOCK_NETWORK node dump-mina-logs --network-id {{network_id}} --node-id {{node_id}}"
+    },
+    {
+      "name": "dump_precomputed_blocks",
+      "args": {
+        "network_id": "string",
+        "node_id": "string"
+      },
+      "command": "MOCK_NETWORK node dump-precomputed-blocks --network-id {{network_id}} --node-id {{node_id}}"
+    },
+    {
+      "name": "run_replayer",
+      "args": {
+        "network_id": "string",
+        "node_id": "string",
+        "start_slot_since_genesis": "int"
+      },
+      "command": "MOCK_NETWORK node run-replayer --network-id {{network_id}} --node-id {{node_id}} --start-slot-since-genesis {{start_slot_since_genesis}}"
+    }
+  ]
+}

integration_tests/return_spec.json

@@ -0,0 +1,49 @@
+{
+  "version": 1,
+  "return_spec": {
+    "create_network": {
+      "network_id": "string",
+      "nodes": {
+        "$node_id": {
+          "graphql_uri" : "string",
+          "node_type" : "string",
+          "private_key" : "string"
+        }
+      }
+    },
+    "start_network": {
+      "network_id": "string"
+    },
+    "delete_network": {
+      "network_id": "string"
+    },
+    "start_node": {
+      "network_id": "string",
+      "node_id": "string"
+    },
+    "stop_node": {
+      "network_id": "string",
+      "node_id": "string"
+    },
+    "dump_archive_data": {
+      "data": "string",
+      "network_id": "string",
+      "node_id": "string"
+    },
+    "dump_mina_logs": {
+      "logs": "string",
+      "network_id": "string",
+      "node_id": "string"
+    },
+    "dump_precomputed_blocks": {
+      "blocks": "string",
+      "network_id": "string",
+      "node_id": "string"
+    },
+    "run_replayer": {
+      "logs": "string",
+      "network_id": "string",
+      "node_id": "string"
+    }
+  }
+}

src/app/test_executive/block_production_priority.ml

@@ -8,50 +8,31 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
 
   open Test_common.Make (Inputs)
 
-  (* TODO: find a way to avoid this type alias (first class module signatures restrictions make this tricky) *)
-  type network = Network.t
-
-  type node = Network.Node.t
-
-  type dsl = Dsl.t
-
   let num_extra_keys = 1000
 
-  (* let num_sender_nodes = 4 *)
+  let test_name = "block-prod-prio"
 
   let config =
     let open Test_config in
+    let open Node_config in
     { default with
-      requires_graphql = true
-    ; genesis_ledger =
-        [ { Test_Account.account_name = "receiver-key"
-          ; balance = "9999999"
-          ; timing = Untimed
-          }
-        ; { account_name = "empty-bp-key"; balance = "0"; timing = Untimed }
-        ; { account_name = "snark-node-key"; balance = "0"; timing = Untimed }
+      genesis_ledger =
+        [ test_account "receiver-key" "9999999"
+        ; test_account "empty-bp-key" "0"
+        ; test_account "snark-node-key" "0"
         ]
         @ List.init num_extra_keys ~f:(fun i ->
               let i_str = Int.to_string i in
-              { Test_Account.account_name =
-                  String.concat [ "sender-account"; i_str ]
-              ; balance = "10000"
-              ; timing = Untimed
-              } )
+              test_account ("sender-account-" ^ i_str) "10000" )
     ; block_producers =
-        [ { node_name = "receiver"; account_name = "receiver-key" }
-        ; { node_name = "empty_node-1"; account_name = "empty-bp-key" }
-        ; { node_name = "empty_node-2"; account_name = "empty-bp-key" }
-        ; { node_name = "empty_node-3"; account_name = "empty-bp-key" }
-        ; { node_name = "empty_node-4"; account_name = "empty-bp-key" }
-        ; { node_name = "observer"; account_name = "empty-bp-key" }
+        [ bp "receiver" ()
+        ; bp "empty_node-1" ~account_name:"empty-bp-key" ()
+        ; bp "empty_node-2" ~account_name:"empty-bp-key" ()
+        ; bp "empty_node-3" ~account_name:"empty-bp-key" ()
+        ; bp "empty_node-4" ~account_name:"empty-bp-key" ()
+        ; bp "observer" ~account_name:"empty-bp-key" ()
         ]
-    ; snark_coordinator =
-        Some
-          { node_name = "snark-node"
-          ; account_name = "snark-node-key"
-          ; worker_nodes = 4
-          }
+    ; snark_coordinator = snark "snark-node" 4
     ; txpool_max_size = 10_000_000
     ; snark_worker_fee = "0.0001"
     ; proof_config =

src/app/test_executive/block_reward_test.ml

@@ -9,20 +9,14 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
 
   open Test_common.Make (Inputs)
 
-  (* TODO: find a way to avoid this type alias (first class module signatures restrictions make this tricky) *)
-  type network = Network.t
-
-  type node = Network.Node.t
-
-  type dsl = Dsl.t
+  let test_name = "block-reward"
 
   let config =
     let open Test_config in
+    let open Node_config in
     { default with
-      requires_graphql = true
-    ; genesis_ledger =
-        [ { account_name = "node-key"; balance = "1000"; timing = Untimed } ]
-    ; block_producers = [ { node_name = "node"; account_name = "node-key" } ]
+      genesis_ledger = [ test_account "node-key" "1000" ]
+    ; block_producers = [ bp "node" () ]
     }
 
   let run network t =

src/app/test_executive/chain_reliability_test.ml

@@ -8,27 +8,18 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
 
   open Test_common.Make (Inputs)
 
-  (* TODO: find a way to avoid this type alias (first class module signatures restrictions make this tricky) *)
-  type network = Network.t
-
-  type node = Network.Node.t
-
-  type dsl = Dsl.t
+  let test_name = "chain-reliability"
 
   let config =
     let open Test_config in
+    let open Node_config in
     { default with
-      requires_graphql = true
-    ; genesis_ledger =
-        [ { account_name = "node-a-key"; balance = "1000"; timing = Untimed }
-        ; { account_name = "node-b-key"; balance = "1000"; timing = Untimed }
-        ; { account_name = "node-c-key"; balance = "0"; timing = Untimed }
-        ]
-    ; block_producers =
-        [ { node_name = "node-a"; account_name = "node-a-key" }
-        ; { node_name = "node-b"; account_name = "node-b-key" }
-        ; { node_name = "node-c"; account_name = "node-c-key" }
+      genesis_ledger =
+        [ test_account "node-a-key" "1000"
+        ; test_account "node-b-key" "1000"
+        ; test_account "node-c-key" "0"
         ]
+    ; block_producers = [ bp "node-a" (); bp "node-b" (); bp "node-c" () ]
     }
 
   let run network t =