From 9d956e8643214b3c1ad0e42cc630e2f35f7b7994 Mon Sep 17 00:00:00 2001 From: rustaceanrob Date: Tue, 27 May 2025 10:09:44 +0100 Subject: [PATCH] test: remove redundant `ServiceFlags` test The `ServiceFlags` type is already tested within p2p/mod.rs with a nearly identical test. This type also has nothing to do with `network` --- bitcoin/src/network/mod.rs | 42 -------------------------------------- 1 file changed, 42 deletions(-) diff --git a/bitcoin/src/network/mod.rs b/bitcoin/src/network/mod.rs index 6137afda9..11e0f2e5b 100644 --- a/bitcoin/src/network/mod.rs +++ b/bitcoin/src/network/mod.rs @@ -364,7 +364,6 @@ impl TryFrom for Network { mod tests { use super::{Network, TestnetVersion}; use crate::consensus::encode::{deserialize, serialize}; - use crate::p2p::ServiceFlags; #[test] fn serialize_deserialize() { @@ -409,47 +408,6 @@ mod tests { assert!("fakenet".parse::().is_err()); } - #[test] - fn service_flags() { - let all = [ - ServiceFlags::NETWORK, - ServiceFlags::GETUTXO, - ServiceFlags::BLOOM, - ServiceFlags::WITNESS, - ServiceFlags::COMPACT_FILTERS, - ServiceFlags::NETWORK_LIMITED, - ServiceFlags::P2P_V2, - ]; - - let mut flags = ServiceFlags::NONE; - for f in all.iter() { - assert!(!flags.has(*f)); - } - - flags |= ServiceFlags::WITNESS; - assert_eq!(flags, ServiceFlags::WITNESS); - - let mut flags2 = flags | ServiceFlags::GETUTXO; - for f in all.iter() { - assert_eq!(flags2.has(*f), *f == ServiceFlags::WITNESS || *f == ServiceFlags::GETUTXO); - } - - flags2 ^= ServiceFlags::WITNESS; - assert_eq!(flags2, ServiceFlags::GETUTXO); - - flags2 |= ServiceFlags::COMPACT_FILTERS; - flags2 ^= ServiceFlags::GETUTXO; - assert_eq!(flags2, ServiceFlags::COMPACT_FILTERS); - - // Test formatting. - assert_eq!("ServiceFlags(NONE)", ServiceFlags::NONE.to_string()); - assert_eq!("ServiceFlags(WITNESS)", ServiceFlags::WITNESS.to_string()); - let flag = ServiceFlags::WITNESS | ServiceFlags::BLOOM | ServiceFlags::NETWORK; - assert_eq!("ServiceFlags(NETWORK|BLOOM|WITNESS)", flag.to_string()); - let flag = ServiceFlags::WITNESS | 0xf0.into(); - assert_eq!("ServiceFlags(WITNESS|COMPACT_FILTERS|0xb0)", flag.to_string()); - } - #[test] #[cfg(feature = "serde")] fn serde_roundtrip() {