deps: upgrade bitflags from 1.3 to 2.9, fix nervosnetwork#4844

Author: eval-exec

Cargo.lock

@@ -113,7 +113,7 @@ axum = "0.7"
 backtrace = "0.3"
 base64 = "0.21.0"
 bit-vec = "0.6.3"
-bitflags = "1.0"
+bitflags = "2.9"
 blake2b-ref = "0.3"
 bloom-filters = "0.1"
 bs58 = "0.5.0"

Cargo.toml

@@ -625,6 +625,7 @@ impl Identify {
 
 bitflags::bitflags! {
     /// Node Function Identification
+    #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
     pub struct Flags: u64 {
         /// Compatibility reserved
         const COMPATIBILITY = 0b1;

network/src/protocols/identify/mod.rs

@@ -4,13 +4,14 @@
 
 use bitflags::bitflags;
 bitflags! {
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct BlockStatus: u32 {
         const UNKNOWN                 =     0;
 
         const HEADER_VALID            =     1;
-        const BLOCK_RECEIVED          =     1 | (Self::HEADER_VALID.bits << 1);
-        const BLOCK_STORED            =     1 | (Self::BLOCK_RECEIVED.bits << 1);
-        const BLOCK_VALID             =     1 | (Self::BLOCK_STORED.bits << 1);
+        const BLOCK_RECEIVED          =     1 | (Self::HEADER_VALID.bits() << 1);
+        const BLOCK_STORED            =     1 | (Self::BLOCK_RECEIVED.bits() << 1);
+        const BLOCK_VALID             =     1 | (Self::BLOCK_STORED.bits() << 1);
 
         const BLOCK_INVALID           =     1 << 12;
     }

shared/src/block_status.rs

@@ -14,6 +14,7 @@ pub trait Verifier {
 
 bitflags! {
     /// The bit flags for particular process block verify
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Switch: u32 {
         /// None of verifier will be disabled
         const NONE                      = 0b00000000;
@@ -43,14 +44,14 @@ bitflags! {
         const DISABLE_EXTENSION         = 0b10000000;
 
         /// Disable all verifier
-        const DISABLE_ALL               = Self::DISABLE_EPOCH.bits | Self::DISABLE_UNCLES.bits |
-                                    Self::DISABLE_TWO_PHASE_COMMIT.bits | Self::DISABLE_DAOHEADER.bits |
-                                    Self::DISABLE_REWARD.bits |
-                                    Self::DISABLE_NON_CONTEXTUAL.bits | Self::DISABLE_SCRIPT.bits |
-                                    Self::DISABLE_EXTENSION.bits;
+        const DISABLE_ALL               = Self::DISABLE_EPOCH.bits() | Self::DISABLE_UNCLES.bits() |
+                                    Self::DISABLE_TWO_PHASE_COMMIT.bits() | Self::DISABLE_DAOHEADER.bits() |
+                                    Self::DISABLE_REWARD.bits() |
+                                    Self::DISABLE_NON_CONTEXTUAL.bits() | Self::DISABLE_SCRIPT.bits() |
+                                    Self::DISABLE_EXTENSION.bits();
 
         /// Only script verification
-        const ONLY_SCRIPT               = Self::DISABLE_ALL.bits & (!Self::DISABLE_SCRIPT.bits);
+        const ONLY_SCRIPT               = Self::DISABLE_ALL.bits() & (!Self::DISABLE_SCRIPT.bits());
     }
 }