Merge pull request #14244 from MinaProtocol/naming_changes_DEV

Naming changes dev

src/app/test_executive/block_production_priority.ml

@@ -114,10 +114,11 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     let window_ms =
       (Network.constraint_constants network).block_window_duration_ms
     in
-    let all_nodes = Network.all_nodes network in
+    let all_mina_nodes = Network.all_mina_nodes network in
     let%bind () =
       wait_for t
-        (Wait_condition.nodes_to_initialize (Core.String.Map.data all_nodes))
+        (Wait_condition.nodes_to_initialize
+           (Core.String.Map.data all_mina_nodes) )
     in
     let%bind () =
       section_hard "wait for 3 blocks to be produced (warm-up)"

src/app/test_executive/chain_reliability_test.ml

@@ -35,10 +35,11 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     let open Network in
     let open Malleable_error.Let_syntax in
     let logger = Logger.create () in
-    let all_nodes = Network.all_nodes network in
+    let all_mina_nodes = Network.all_mina_nodes network in
     let%bind () =
       wait_for t
-        (Wait_condition.nodes_to_initialize (Core.String.Map.data all_nodes))
+        (Wait_condition.nodes_to_initialize
+           (Core.String.Map.data all_mina_nodes) )
     in
     let node_a =
       Core.String.Map.find_exn (Network.block_producers network) "node-a"
@@ -57,12 +58,12 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       section "short bootstrap"
         (let%bind () = Node.stop node_c in
          [%log info] "%s stopped, will now wait for blocks to be produced"
-           (Node.id node_c) ;
+           (Node.infra_id node_c) ;
          let%bind _ = wait_for t (Wait_condition.blocks_to_be_produced 2) in
          let%bind () = Node.start ~fresh_state:true node_c in
          [%log info]
            "%s started again, will now wait for this node to initialize"
-           (Node.id node_c) ;
+           (Node.infra_id node_c) ;
          let%bind () = wait_for t (Wait_condition.node_to_initialize node_c) in
          wait_for t
            ( Wait_condition.nodes_to_synchronize [ node_a; node_b; node_c ]
@@ -105,7 +106,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     section "common prefix of all nodes is no farther back than 1 block"
       (* the common prefix test relies on at least 4 blocks having been produced.  previous sections altogether have already produced 4, so no further block production is needed.  if previous sections change, then this may need to be re-adjusted*)
       (let%bind (labeled_chains : (string * string list) list) =
-         Malleable_error.List.map (Core.String.Map.data all_nodes)
+         Malleable_error.List.map (Core.String.Map.data all_mina_nodes)
            ~f:(fun node ->
              let%map chain =
                Integration_test_lib.Graphql_requests.must_get_best_chain ~logger

src/app/test_executive/gossip_consistency.ml

@@ -36,7 +36,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     let%bind () =
       wait_for t
         (Wait_condition.nodes_to_initialize
-           (Core.String.Map.data (Network.all_nodes network)) )
+           (Core.String.Map.data (Network.all_mina_nodes network)) )
     in
     [%log info] "gossip_consistency test: done waiting for initializations" ;
     let receiver_bp =

src/app/test_executive/medium_bootstrap.ml

@@ -47,11 +47,12 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     let open Network in
     let open Malleable_error.Let_syntax in
     let logger = Logger.create () in
-    let all_nodes = Network.all_nodes network in
+    let all_mina_nodes = Network.all_mina_nodes network in
     let%bind () =
       section_hard "Wait for nodes to initialize"
         (wait_for t
-           (Wait_condition.nodes_to_initialize (Core.String.Map.data all_nodes)) )
+           (Wait_condition.nodes_to_initialize
+              (Core.String.Map.data all_mina_nodes) ) )
     in
     let node_a =
       Core.String.Map.find_exn (Network.block_producers network) "node-a"
@@ -84,7 +85,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       section_hard "network is fully connected after one node was restarted"
         (let%bind () = Malleable_error.lift (after (Time.Span.of_sec 240.0)) in
          let%bind final_connectivity_data =
-           fetch_connectivity_data ~logger (Core.String.Map.data all_nodes)
+           fetch_connectivity_data ~logger (Core.String.Map.data all_mina_nodes)
          in
          assert_peers_completely_connected final_connectivity_data )
     in
@@ -116,7 +117,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     section_hard "network is fully connected after one node was restarted"
       (let%bind () = Malleable_error.lift (after (Time.Span.of_sec 240.0)) in
        let%bind final_connectivity_data =
-         fetch_connectivity_data ~logger (Core.String.Map.data all_nodes)
+         fetch_connectivity_data ~logger (Core.String.Map.data all_mina_nodes)
        in
        assert_peers_completely_connected final_connectivity_data )
 end

src/app/test_executive/payments_test.ml

@@ -69,10 +69,11 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
   let run network t =
     let open Malleable_error.Let_syntax in
     let logger = Logger.create () in
-    let all_nodes = Network.all_nodes network in
+    let all_mina_nodes = Network.all_mina_nodes network in
     let%bind () =
       wait_for t
-        (Wait_condition.nodes_to_initialize (Core.String.Map.data all_nodes))
+        (Wait_condition.nodes_to_initialize
+           (Core.String.Map.data all_mina_nodes) )
     in
     let untimed_node_a =
       Core.String.Map.find_exn

src/app/test_executive/peers_reliability_test.ml

@@ -36,13 +36,13 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     let open Network in
     let open Malleable_error.Let_syntax in
     let logger = Logger.create () in
-    let all_nodes = Network.all_nodes network in
+    let all_mina_nodes = Network.all_mina_nodes network in
     [%log info] "peers_list"
       ~metadata:
         [ ( "peers"
           , `List
-              (List.map (Core.String.Map.data all_nodes) ~f:(fun n ->
-                   `String (Node.id n) ) ) )
+              (List.map (Core.String.Map.data all_mina_nodes) ~f:(fun n ->
+                   `String (Node.infra_id n) ) ) )
         ] ;
     let node_a =
       Core.String.Map.find_exn (Network.block_producers network) "node-a"
@@ -68,10 +68,11 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     (* let%bind () = wait_for t (Wait_condition.nodes_to_initialize [ node_c ]) in *)
     let%bind () =
       wait_for t
-        (Wait_condition.nodes_to_initialize (Core.String.Map.data all_nodes))
+        (Wait_condition.nodes_to_initialize
+           (Core.String.Map.data all_mina_nodes) )
     in
     let%bind initial_connectivity_data =
-      fetch_connectivity_data ~logger (Core.String.Map.data all_nodes)
+      fetch_connectivity_data ~logger (Core.String.Map.data all_mina_nodes)
     in
     let%bind () =
       section "network is fully connected upon initialization"
@@ -202,7 +203,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     section "network is fully connected after one node was restarted"
       (let%bind () = Malleable_error.lift (after (Time.Span.of_sec 240.0)) in
        let%bind final_connectivity_data =
-         fetch_connectivity_data ~logger (Core.String.Map.data all_nodes)
+         fetch_connectivity_data ~logger (Core.String.Map.data all_mina_nodes)
        in
        assert_peers_completely_connected final_connectivity_data )
 end

src/app/test_executive/test_common.ml

@@ -86,7 +86,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
         Malleable_error.hard_error_format
           "Node '%s' did not have a network keypair, if node is a block \
            producer this should not happen"
-          (Engine.Network.Node.id node)
+          (Engine.Network.Node.infra_id node)
 
   let pub_key_of_node =
     make_get_key ~f:(fun nk ->
@@ -155,8 +155,10 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     (* this check checks if every single peer in the network is connected to every other peer, in graph theory this network would be a complete graph.  this property will only hold true on small networks *)
     let check_peer_connected_to_all_others ~nodes_by_peer_id ~peer_id
         ~connected_peers =
-      let get_node_id p =
-        p |> String.Map.find_exn nodes_by_peer_id |> Engine.Network.Node.id
+      let get_node_infra_id p =
+        p
+        |> String.Map.find_exn nodes_by_peer_id
+        |> Engine.Network.Node.infra_id
       in
       let expected_peers =
         nodes_by_peer_id |> String.Map.keys
@@ -165,7 +167,8 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       Malleable_error.List.iter expected_peers ~f:(fun p ->
           let error =
             Printf.sprintf "node %s (id=%s) is not connected to node %s (id=%s)"
-              (get_node_id peer_id) peer_id (get_node_id p) p
+              (get_node_infra_id peer_id)
+              peer_id (get_node_infra_id p) p
             |> Error.of_string
           in
           Malleable_error.ok_if_true

src/app/test_executive/test_executive.ml

@@ -364,24 +364,24 @@ let main inputs =
         [%log info] "Starting the daemons within the pods" ;
         let start_print (node : Engine.Network.Node.t) =
           let open Malleable_error.Let_syntax in
-          [%log info] "starting %s ..." (Engine.Network.Node.id node) ;
+          [%log info] "starting %s ..." (Engine.Network.Node.infra_id node) ;
           let%bind res = Engine.Network.Node.start ~fresh_state:false node in
-          [%log info] "%s started" (Engine.Network.Node.id node) ;
+          [%log info] "%s started" (Engine.Network.Node.infra_id node) ;
           Malleable_error.return res
         in
         let seed_nodes =
           network |> Engine.Network.seeds |> Core.String.Map.data
         in
         let non_seed_pods =
-          network |> Engine.Network.all_non_seed_pods |> Core.String.Map.data
+          network |> Engine.Network.all_non_seed_nodes |> Core.String.Map.data
         in
         let _offline_node_event_subscription =
           (* Monitor for offline nodes; abort the test if a node goes down
              unexpectedly.
           *)
           Dsl.Event_router.on (Dsl.event_router dsl) Node_offline
             ~f:(fun offline_node () ->
-              let node_name = Engine.Network.Node.app_id offline_node in
+              let node_name = Engine.Network.Node.infra_id offline_node in
               [%log info] "Detected node offline $node"
                 ~metadata:[ ("node", `String node_name) ] ;
               if Engine.Network.Node.should_be_running offline_node then (

src/app/test_executive/verification_key_update.ml

@@ -104,7 +104,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       section_hard "Wait for nodes to initialize"
         (wait_for t
            (Wait_condition.nodes_to_initialize
-              (Core.String.Map.data (Network.all_nodes network)) ) )
+              (Core.String.Map.data (Network.all_mina_nodes network)) ) )
     in
     let whale1 =
       Core.String.Map.find_exn (Network.block_producers network) "whale1"

src/app/test_executive/zkapps.ml

@@ -136,7 +136,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       section_hard "Wait for nodes to initialize"
         (wait_for t
            ( Wait_condition.nodes_to_initialize
-           @@ (Network.all_nodes network |> Core.String.Map.data) ) )
+           @@ (Network.all_mina_nodes network |> Core.String.Map.data) ) )
     in
     let node =
       Core.String.Map.find_exn (Network.block_producers network) "node-a"

src/app/test_executive/zkapps_nonce_test.ml

@@ -136,7 +136,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
            (List.filter
               ~f:(fun n ->
                 String.(Network.Node.id n <> Network.Node.id first_bp) )
-              (Core.String.Map.data (Network.all_nodes network)) ) )
+              (Core.String.Map.data (Network.all_mina_nodes network)) ) )
     in
     let keymap =
       List.fold [ fish1_kp ] ~init:Signature_lib.Public_key.Compressed.Map.empty

src/app/test_executive/zkapps_timing.ml

@@ -44,10 +44,11 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
   let run network t =
     let open Malleable_error.Let_syntax in
     let logger = Logger.create () in
-    let all_nodes = Network.all_nodes network in
+    let all_mina_nodes = Network.all_mina_nodes network in
     let%bind () =
       wait_for t
-        (Wait_condition.nodes_to_initialize (Core.String.Map.data all_nodes))
+        (Wait_condition.nodes_to_initialize
+           (Core.String.Map.data all_mina_nodes) )
     in
     let block_producer_nodes =
       Network.block_producers network |> Core.String.Map.data

src/lib/integration_test_cloud_engine/graphql_polling_log_engine.ml

@@ -56,15 +56,15 @@ let parse_event_from_log_entry ~logger log_entry =
       in
       event )
 
-let rec poll_get_filtered_log_entries_node ~logger ~event_writer
-    ~last_log_index_seen node =
+let rec filtered_log_entries_poll node ~logger ~event_writer
+    ~last_log_index_seen =
   let open Deferred.Let_syntax in
   if not (Pipe.is_closed event_writer) then (
     let%bind () = after (Time.Span.of_ms 10000.0) in
     match%bind
       Integration_test_lib.Graphql_requests.get_filtered_log_entries
-        ~last_log_index_seen
         (Node.get_ingress_uri node)
+        ~last_log_index_seen
     with
     | Ok log_entries ->
         Array.iter log_entries ~f:(fun log_entry ->
@@ -77,12 +77,12 @@ let rec poll_get_filtered_log_entries_node ~logger ~event_writer
         let last_log_index_seen =
           Array.length log_entries + last_log_index_seen
         in
-        poll_get_filtered_log_entries_node ~logger ~event_writer
-          ~last_log_index_seen node
+        filtered_log_entries_poll node ~logger ~event_writer
+          ~last_log_index_seen
     | Error err ->
         [%log error] "Encountered an error while polling $node for logs: $err"
           ~metadata:
-            [ ("node", `String node.app_id)
+            [ ("node", `String (Node.infra_id node))
             ; ("err", Error_json.error_to_yojson err)
             ] ;
         (* Declare the node to be offline. *)
@@ -92,7 +92,7 @@ let rec poll_get_filtered_log_entries_node ~logger ~event_writer
         return (Ok ()) )
   else Deferred.Or_error.error_string "Event writer closed"
 
-let rec poll_start_filtered_log_node ~logger ~log_filter ~event_writer node =
+let rec start_filtered_log node ~logger ~log_filter ~event_writer =
   let open Deferred.Let_syntax in
   if not (Pipe.is_closed event_writer) then
     match%bind
@@ -103,27 +103,24 @@ let rec poll_start_filtered_log_node ~logger ~log_filter ~event_writer node =
     | Ok () ->
         return (Ok ())
     | Error _ ->
-        poll_start_filtered_log_node ~logger ~log_filter ~event_writer node
+        start_filtered_log node ~logger ~log_filter ~event_writer
   else Deferred.Or_error.error_string "Event writer closed"
 
 let rec poll_node_for_logs_in_background ~log_filter ~logger ~event_writer
     (node : Node.t) =
   let open Deferred.Or_error.Let_syntax in
   [%log info] "Requesting for $node to start its filtered logs"
-    ~metadata:[ ("node", `String node.app_id) ] ;
-  let%bind () =
-    poll_start_filtered_log_node ~logger ~log_filter ~event_writer node
-  in
+    ~metadata:[ ("node", `String (Node.infra_id node)) ] ;
+  let%bind () = start_filtered_log ~logger ~log_filter ~event_writer node in
   [%log info] "$node has started its filtered logs. Beginning polling"
-    ~metadata:[ ("node", `String node.app_id) ] ;
+    ~metadata:[ ("node", `String (Node.infra_id node)) ] ;
   let%bind () =
-    poll_get_filtered_log_entries_node ~last_log_index_seen:0 ~logger
-      ~event_writer node
+    filtered_log_entries_poll node ~last_log_index_seen:0 ~logger ~event_writer
   in
   poll_node_for_logs_in_background ~log_filter ~logger ~event_writer node
 
 let poll_for_logs_in_background ~log_filter ~logger ~network ~event_writer =
-  Kubernetes_network.all_pods network
+  Kubernetes_network.all_nodes network
   |> Core.String.Map.data
   |> Deferred.Or_error.List.iter ~how:`Parallel
        ~f:(poll_node_for_logs_in_background ~log_filter ~logger ~event_writer)