Fix network status version check (starcoinorg#2976)

Author: sanlee42

network-p2p/peerset/src/lib.rs

@@ -57,7 +57,7 @@ pub const BANNED_THRESHOLD: i32 = 82 * (i32::min_value() / 100);
 const DISCONNECT_REPUTATION_CHANGE: i32 = -256;
 /// Amount of time between the moment we disconnect from a node and the moment we remove it from
 /// the list.
-const FORGET_AFTER: Duration = Duration::from_secs(3600);
+const FORGET_AFTER: Duration = Duration::from_secs(10);
 
 #[derive(Debug)]
 enum Action {
@@ -523,13 +523,8 @@ impl Peerset {
                     self.message_queue.push_back(Message::Banned(peer_id))
                 }
                 peer_reputation.set_reputation(after);
-                if after != 0 {
-                    continue;
-                }
-
                 drop(peer_reputation);
-
-                // If the peer reaches a reputation of 0, and there is no connection to it,
+                // If the peer has no connection to it,
                 // forget it.
                 for set_index in 0..self.data.num_sets() {
                     match self.data.peer(set_index, &peer_id) {

network-p2p/peerset/src/peersstate.rs

@@ -607,11 +607,10 @@ impl<'a> NotConnectedPeer<'a> {
             peer.sets[self.set] = MembershipState::NotMember;
 
             // Remove the peer from `self.state.nodes` entirely if it isn't a member of any set.
-            if peer.reputation == 0
-                && peer
-                    .sets
-                    .iter()
-                    .all(|set| matches!(set, MembershipState::NotMember))
+            if peer
+                .sets
+                .iter()
+                .all(|set| matches!(set, MembershipState::NotMember))
             {
                 self.state.nodes.remove(&*self.peer_id);
             }

network-p2p/src/protocol.rs

@@ -490,17 +490,17 @@ impl Protocol {
             }
             self.peerset_handle.report_peer(who, rep::GENESIS_MISMATCH);
             self.behaviour.disconnect_peer(&who, set_id);
-            return CustomMessageOutcome::None;
+            return CustomMessageOutcome::Banned(who);
         }
-        if status.version < MIN_VERSION && CURRENT_VERSION < status.min_supported_version {
+        if status.version < MIN_VERSION || CURRENT_VERSION < status.min_supported_version {
             log!(
                 target: "network-p2p",
                 if self.important_peers.contains(&who) { Level::Warn } else { Level::Debug },
                 "Peer {:?} using unsupported protocol version {}", who, status.version
             );
             self.peerset_handle.report_peer(who, rep::BAD_PROTOCOL);
             self.behaviour.disconnect_peer(&who, set_id);
-            return CustomMessageOutcome::None;
+            return CustomMessageOutcome::Banned(who);
         }
         debug!(target: "network-p2p", "Connected {}", who);
         let peer = Peer {