From ec2258e36e20dc8e933ddc68a0f83ef3f3b48545 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Thu, 30 Nov 2023 15:38:58 +0800
Subject: [PATCH] refactor(connection-limits): make `check_limit` a
 free-function

Pull-Request: #4958.
---
 misc/connection-limits/src/lib.rs | 37 +++++++++++++------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/misc/connection-limits/src/lib.rs b/misc/connection-limits/src/lib.rs
index af76e9a57d9..cb12599ad79 100644
--- a/misc/connection-limits/src/lib.rs
+++ b/misc/connection-limits/src/lib.rs
@@ -79,22 +79,17 @@ impl Behaviour {
             established_per_peer: Default::default(),
         }
     }
+}
 
-    fn check_limit(
-        &mut self,
-        limit: Option<u32>,
-        current: usize,
-        kind: Kind,
-    ) -> Result<(), ConnectionDenied> {
-        let limit = limit.unwrap_or(u32::MAX);
-        let current = current as u32;
+fn check_limit(limit: Option<u32>, current: usize, kind: Kind) -> Result<(), ConnectionDenied> {
+    let limit = limit.unwrap_or(u32::MAX);
+    let current = current as u32;
 
-        if current >= limit {
-            return Err(ConnectionDenied::new(Exceeded { limit, kind }));
-        }
-
-        Ok(())
+    if current >= limit {
+        return Err(ConnectionDenied::new(Exceeded { limit, kind }));
     }
+
+    Ok(())
 }
 
 /// A connection limit has been exceeded.
@@ -210,7 +205,7 @@ impl NetworkBehaviour for Behaviour {
         _: &Multiaddr,
         _: &Multiaddr,
     ) -> Result<(), ConnectionDenied> {
-        self.check_limit(
+        check_limit(
             self.limits.max_pending_incoming,
             self.pending_inbound_connections.len(),
             Kind::PendingIncoming,
@@ -230,12 +225,12 @@ impl NetworkBehaviour for Behaviour {
     ) -> Result<THandler<Self>, ConnectionDenied> {
         self.pending_inbound_connections.remove(&connection_id);
 
-        self.check_limit(
+        check_limit(
             self.limits.max_established_incoming,
             self.established_inbound_connections.len(),
             Kind::EstablishedIncoming,
         )?;
-        self.check_limit(
+        check_limit(
             self.limits.max_established_per_peer,
             self.established_per_peer
                 .get(&peer)
@@ -243,7 +238,7 @@ impl NetworkBehaviour for Behaviour {
                 .unwrap_or(0),
             Kind::EstablishedPerPeer,
         )?;
-        self.check_limit(
+        check_limit(
             self.limits.max_established_total,
             self.established_inbound_connections.len()
                 + self.established_outbound_connections.len(),
@@ -260,7 +255,7 @@ impl NetworkBehaviour for Behaviour {
         _: &[Multiaddr],
         _: Endpoint,
     ) -> Result<Vec<Multiaddr>, ConnectionDenied> {
-        self.check_limit(
+        check_limit(
             self.limits.max_pending_outgoing,
             self.pending_outbound_connections.len(),
             Kind::PendingOutgoing,
@@ -280,12 +275,12 @@ impl NetworkBehaviour for Behaviour {
     ) -> Result<THandler<Self>, ConnectionDenied> {
         self.pending_outbound_connections.remove(&connection_id);
 
-        self.check_limit(
+        check_limit(
             self.limits.max_established_outgoing,
             self.established_outbound_connections.len(),
             Kind::EstablishedOutgoing,
         )?;
-        self.check_limit(
+        check_limit(
             self.limits.max_established_per_peer,
             self.established_per_peer
                 .get(&peer)
@@ -293,7 +288,7 @@ impl NetworkBehaviour for Behaviour {
                 .unwrap_or(0),
             Kind::EstablishedPerPeer,
         )?;
-        self.check_limit(
+        check_limit(
             self.limits.max_established_total,
             self.established_inbound_connections.len()
                 + self.established_outbound_connections.len(),