Mergin branches

beacon_node/lighthouse_network/src/config.rs

@@ -560,4 +560,4 @@ pub const fn is_global_ipv6(addr: &Ipv6Addr) -> bool {
             || is_documentation(addr)
             || is_unique_local(addr)
             || is_unicast_link_local(addr))
-}
+}

beacon_node/lighthouse_network/src/discovery/enr.rs

@@ -258,4 +258,4 @@ pub fn save_enr_to_disk(dir: &Path, enr: &Enr, log: &slog::Logger) {
             );
         }
     }
-}
+}

beacon_node/lighthouse_network/src/peer_manager/mod.rs

@@ -2331,4 +2331,4 @@ mod tests {
             })
         }
     }
-}
+}

beacon_node/lighthouse_network/src/rpc/protocol.rs

@@ -660,4 +660,4 @@ impl RPCError {
             e => e.into(),
         }
     }
-}
+}

beacon_node/lighthouse_network/src/types/pubsub.rs

@@ -319,4 +319,4 @@ impl<T: EthSpec> std::fmt::Display for PubsubMessage<T> {
             }
         }
     }
-}
+}

beacon_node/lighthouse_network/tests/common.rs

@@ -197,4 +197,4 @@ pub async fn build_linear(
         };
     }
     nodes
-}
+}

boot_node/src/config.rs

@@ -190,4 +190,4 @@ impl BootNodeConfigSerialization {
             enable_enr_auto_update: discv5_config.enr_update,
         }
     }
-}
+}