Merge pull request #14281 from MinaProtocol/more_renaming

finish up renaming

Author: QuiteStochastic

src/app/test_executive/block_reward_test.ml

@@ -28,10 +28,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 node =
       Core.String.Map.find_exn (Network.block_producers network) "node"

src/app/test_executive/hard_fork.ml

@@ -186,10 +186,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 node_a =
       Core.String.Map.find_exn (Network.block_producers network) "node-a"

src/app/test_executive/peers_reliability_test.ml

@@ -173,7 +173,7 @@ 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 1
@@ -185,7 +185,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
          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) ;
          (* we've witnessed the loading of the node_c frontier on initialization
             so the event here must be the frontier loading on the node_c restart
          *)

src/lib/integration_test_lib/network_state.ml

@@ -164,7 +164,7 @@ module Make
                           in
                           [%log debug] "GOSSIP RECEIVED by $node"
                             ~metadata:[ ("node", `String (Node.infra_id node)) ] ;
-                          [%log debug] "GOSSIP RECEIVED recevied event: $event"
+                          [%log debug] "GOSSIP RECEIVED received event: $event"
                             ~metadata:
                               [ ( "event"
                                 , Event_type.event_to_yojson
@@ -202,7 +202,7 @@ module Make
                 [%log debug]
                   "Updating network state with persisted frontier loaded event \
                    of $node"
-                  ~metadata:[ ("node", `String (Node.id node)) ] ;
+                  ~metadata:[ ("node", `String (Node.infra_id node)) ] ;
                 { state with
                   num_persisted_frontier_loaded =
                     state.num_persisted_frontier_loaded + 1
@@ -216,7 +216,7 @@ module Make
                 [%log debug]
                   "Updating network state with persisted frontier fresh boot \
                    event of $node"
-                  ~metadata:[ ("node", `String (Node.id node)) ] ;
+                  ~metadata:[ ("node", `String (Node.infra_id node)) ] ;
                 { state with
                   num_persisted_frontier_fresh_boot =
                     state.num_persisted_frontier_fresh_boot + 1
@@ -230,7 +230,7 @@ module Make
                 [%log debug]
                   "Updating network state with bootstrap required event of \
                    $node"
-                  ~metadata:[ ("node", `String (Node.id node)) ] ;
+                  ~metadata:[ ("node", `String (Node.infra_id node)) ] ;
                 { state with
                   num_bootstrap_required = state.num_bootstrap_required + 1
                 } ) )
@@ -243,7 +243,7 @@ module Make
                 [%log debug]
                   "Updating network state with persisted frontier dropped \
                    event of $node"
-                  ~metadata:[ ("node", `String (Node.id node)) ] ;
+                  ~metadata:[ ("node", `String (Node.infra_id node)) ] ;
                 { state with
                   num_persisted_frontier_dropped =
                     state.num_persisted_frontier_dropped + 1
@@ -258,7 +258,7 @@ module Make
                 [%log debug]
                   "Updating network state with transition frontier loaded \
                    event of $node"
-                  ~metadata:[ ("node", `String (Node.id node)) ] ;
+                  ~metadata:[ ("node", `String (Node.infra_id node)) ] ;
                 { state with
                   num_transition_frontier_loaded_from_persistence =
                     state.num_transition_frontier_loaded_from_persistence + 1