A number of unused preprocessor definitions proliferate the tree. Resolves project-chip#525 (project-chip#774)

* Cleaning out dead code, and renaming

* Cleaning up more constants

* More cleanup

* Fixing build

* Updating end periods

* Update src/lib/core/CHIPError.h

Co-authored-by: Yakun Xu <xyk@google.com>

Co-authored-by: Yakun Xu <xyk@google.com>

Author: woody-apple

config/esp32/components/chip/Kconfig

@@ -305,70 +305,6 @@ menu "CHIP Core"
 
     endmenu # "Security Options"
 
-    menu "CHIP Data Management Options"
-
-        config MAX_WDM_SUBSCRIPTION_CLIENTS
-            int "Max WDM Subscription Clients"
-            default 2
-            help
-                Specifies the maximum number of WDM subscription client objects that can be active simultaneously.
-                One client object is required for each outbound subscription from the device to a peer node, including
-                the subscription the device establishes to the CHIP service, if enabled.
-
-        config MAX_WDM_SUBSCRIPTION_HANDLERS
-            int "Max WDM Subscription Handlers"
-            default 2
-            help
-                Specifies the maximum number of WDM subscription handlers objects that can be active simultaneously.
-                One handler object is required for each inbound subscription to the device from a peer node.  This
-                includes the counter-subscription from the CHIP service to the device, if enabled.
-
-        config MAX_WDM_NOTIFIES_IN_FLIGHT
-            int "Maximum In-flight WDM Notify Messages"
-            default 2
-            help
-                Specifies the maximum number of WDM notify messages that can be in-flight at any given time, across
-                all active inbound subscriptions.  Any changes to trait data that occur while this limit is reached
-                will be queued locally until an in-flight completes.
-
-        config MAX_WDM_NOTIFY_SIZE
-            int "Maximum WDM Notify Message Size"
-            default 2048
-            help
-                Specifies the maximum size (in bytes) of a WDM notify message that will be generated while servicing
-                an inbound subscription to the device.  The limit governs both notify messages that are generated
-                as part of the subscription establishment process, as well as those generated when data changes
-                occur.
-
-                Note that other limits, such as UDP MTU size limits, or limits on available packet buffers may mean
-                that notify messages smaller than this limit are generated.
-
-        config MIN_WDM_NOTIFY_BUFFER_SIZE
-            int "Minimum WDM Notify Buffer Size"
-            default 1024
-            help
-                When allocating a packet buffer in preparation for generating a WDM notify message, defer sending
-                the notify message if a buffer of at least this size is unavailable.
-
-                Note that, because the WDM protocol requires that the static properties of a trait, and any
-                events emited by a trait, fit within a single notify message, this value should be set *larger*
-                than the larges of these limits for any trait published by the device.
-
-        config MAX_WDM_RESUBSCRIBE_INTERVAL
-            int "Maximum WDM Resubscribe Interval (ms)"
-            default 5538000
-            help
-                When the default fibonacci-based resubscription back-off policy is in effect, this value specifies the
-                maximum time (in ms) between any two resubscription attempts.
-
-        config WDM_ENABLE_SCHEMA_CHECK
-            bool "Enable WDM Message Schema Checking"
-            default y
-            help
-                Enables pre-flight schema validation for protocol messages used in CHIP Data Management profile.
-
-    endmenu
-
 endmenu # "CHIP"
 
 

config/ios/CHIPProjectConfig.h

@@ -40,9 +40,6 @@
 // Uncomment this for a large Tunnel MTU.
 //#define CHIP_CONFIG_TUNNEL_INTERFACE_MTU                           (9000)
 
-// Max number of Bindings per CHIPExchangeManager
-#define CHIP_CONFIG_MAX_BINDINGS 8
-
 #define CHIP_CONFIG_LEGACY_CASE_AUTH_DELEGATE 0
 
 #define CHIP_CONFIG_LEGACY_KEY_EXPORT_DELEGATE 0

config/standalone/CHIPProjectConfig.h

@@ -26,9 +26,6 @@
 
 #define CHIP_CONFIG_ENABLE_EPHEMERAL_UDP_PORT 1
 
-// Configure WDM for event offload
-#define CHIP_CONFIG_EVENT_LOGGING_WDM_OFFLOAD 1
-
 #define CHIP_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS 1
 
 #define CHIP_CONFIG_EVENT_LOGGING_NUM_EXTERNAL_CALLBACKS 2
@@ -38,9 +35,6 @@
 // Uncomment this for a large Tunnel MTU.
 //#define CHIP_CONFIG_TUNNEL_INTERFACE_MTU                           (9000)
 
-// Max number of Bindings per CHIPExchangeManager
-#define CHIP_CONFIG_MAX_BINDINGS 8
-
 // Enable support functions for parsing command-line arguments
 #define CHIP_CONFIG_ENABLE_ARG_PARSER 1
 
@@ -54,7 +48,7 @@
 // Increase session idle timeout in stand-alone builds for the convenience of developers.
 #define CHIP_CONFIG_DEFAULT_SECURITY_SESSION_IDLE_TIMEOUT 120000
 
-#define CHIP_CONFIG_ENABLE_WDM_UPDATE 1
+#define CHIP_CONFIG_ENABLE_UPDATE 1
 
 #define CHIP_CONFIG_LEGACY_CASE_AUTH_DELEGATE 0
 

configure.ac

@@ -2135,7 +2135,6 @@ AC_MSG_NOTICE([
   Build long running tests                         : ${nl_cv_build_long_tests}
   Build tools                                      : ${build_tools}
   Tunnel Failover support                          : ${build_tunnel_failover}
-  Build legacy WDM profile                         : ${build_legacy_wdm}
   Prefix                                           : ${prefix}
   Shadow directory program                         : ${LNDIR}
   Cocoa support                                    : ${enable_cocoa}

docs/Doxyfile.in

@@ -1989,7 +1989,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = CHIP_SYSTEM_CONFIG_USE_SOCKETS=1 CHIP_SYSTEM_CONFIG_USE_LWIP=1 INET_CONFIG_ENABLE_IPV4=1 CHIP_CONFIG_SECURITY_TEST_MODE=1 CHIP_CONFIG_ENABLE_RELIABLE_MESSAGING=1 DEPRECATED_MSG_ATTRIBUTE(x)=
+PREDEFINED             = CHIP_SYSTEM_CONFIG_USE_SOCKETS=1 CHIP_SYSTEM_CONFIG_USE_LWIP=1 INET_CONFIG_ENABLE_IPV4=1 CHIP_CONFIG_SECURITY_TEST_MODE=1 DEPRECATED_MSG_ATTRIBUTE(x)=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

examples/lock-app/efr32/include/CHIPProjectConfig.h

@@ -108,22 +108,6 @@
  */
 #define CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER "DUMMY_SN"
 
-/**
- * CHIP_CONFIG_MAX_BINDINGS
- *
- * Maximum number of simultaneously active bindings per ChipExchangeManager
- * 1 (Time Sync) + 2 (Two 1-way subscriptions) + 1 (Software Update) = 4
- * in the worst case. Keeping another 4 as buffer.
- */
-#define CHIP_CONFIG_MAX_BINDINGS 8
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_WDM_OFFLOAD
- *
- * Select the ability to offload event logs to any interested subscribers using WDM.
- */
-#define CHIP_CONFIG_EVENT_LOGGING_WDM_OFFLOAD 1
-
 /**
  * CHIP_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS
  *

examples/lock-app/nrf5/main/include/CHIPProjectConfig.h

@@ -116,22 +116,6 @@
  */
 //#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
 
-/**
- * CHIP_CONFIG_MAX_BINDINGS
- *
- * Maximum number of simultaneously active bindings per CHIPExchangeManager
- * 1 (Time Sync) + 2 (Two 1-way subscriptions) + 1 (Software Update) = 4
- * in the worst case. Keeping another 4 as buffer.
- */
-#define CHIP_CONFIG_MAX_BINDINGS 8
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_WDM_OFFLOAD
- *
- * Select the ability to offload event logs to any interested subscribers using WDM.
- */
-#define CHIP_CONFIG_EVENT_LOGGING_WDM_OFFLOAD 1
-
 /**
  * CHIP_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS
  *

src/include/platform/CHIPDeviceEvent.h

@@ -137,13 +137,6 @@ enum PublicEventTypes
      */
     kServiceConnectivityChange,
 
-    /**
-     * Service Subscription State Change
-     *
-     * Signals a change in the device's WDM subscription state with a chip-enabled service.
-     */
-    kServiceSubscriptionStateChange,
-
     /**
      * Fabric Membership Change
      *

src/lib/core/CHIPConfig.h

@@ -1267,20 +1267,6 @@
 #define CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS                  16
 #endif // CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
 
-/**
- *  @def CHIP_CONFIG_MAX_BINDINGS
- *
- *  @brief
- *    Maximum number of simultaneously active bindings per chipExchangeManager
- *    The new single source TimeSync client takes one binding.
- *    Every WDM one-way subscription takes one binding. Mutual subscription counts as two one-way subscriptions.
- *    A reserved slot is needed to take an incoming subscription request.
- *    For a device with 2 mutual subscriptions, and one single source time sync client, it needs 2 x 2 + 1 = 5 bindings at least.
- *    At least six is needed if it still wants to take new WDM subscriptions under this load.
- */
-#ifndef CHIP_CONFIG_MAX_BINDINGS
-#define CHIP_CONFIG_MAX_BINDINGS                           6
-#endif // CHIP_CONFIG_MAX_BINDINGS
 
 /**
  *  @def CHIP_CONFIG_CONNECT_IP_ADDRS
@@ -2137,19 +2123,6 @@
 #define CHIP_CONFIG_SERIALIZATION_DEBUG_LOGGING 0
 #endif
 
-/**
- * @def CHIP_CONFIG_SERIALIZATION_ENABLE_DESERIALIZATION
- *
- * @brief Enable deserialization as well as serialization APIs.  We
- *   make deserialization configurable because it requires some extra
- *   memory that a highly resource-constrained platform could preserve
- *   if it doesn't consume WDM events or otherwise has no need to
- *   deserialize.
- */
-#ifndef CHIP_CONFIG_SERIALIZATION_ENABLE_DESERIALIZATION
-#define CHIP_CONFIG_SERIALIZATION_ENABLE_DESERIALIZATION 1
-#endif
-
 /**
  * @def CHIP_CONFIG_SERIALIZATION_LOG_FLOATS
  *

src/lib/core/CHIPError.cpp

@@ -421,7 +421,7 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
         desc = "Shortcut Tunnel peer entry not found";
         break;
     case CHIP_ERROR_TUNNEL_FORCE_ABORT:
-        desc = "Forced Tunnel Abort.";
+        desc = "Forced Tunnel Abort";
         break;
     case CHIP_ERROR_DRBG_ENTROPY_SOURCE_FAILED:
         desc = "DRBG entropy source failed to generate entropy data";
@@ -478,43 +478,43 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
         desc = "Failure to lock/unlock OS-provided lock";
         break;
     case CHIP_ERROR_UNSUPPORTED_PASSCODE_CONFIG:
-        desc = "Unsupported passcode encryption configuration.";
+        desc = "Unsupported passcode encryption configuration";
         break;
     case CHIP_ERROR_PASSCODE_AUTHENTICATION_FAILED:
-        desc = "Passcode authentication failed.";
+        desc = "Passcode authentication failed";
         break;
     case CHIP_ERROR_PASSCODE_FINGERPRINT_FAILED:
-        desc = "Passcode fingerprint failed.";
+        desc = "Passcode fingerprint failed";
         break;
     case CHIP_ERROR_SERIALIZATION_ELEMENT_NULL:
-        desc = "Element requested is null.";
+        desc = "Element requested is null";
         break;
     case CHIP_ERROR_WRONG_CERT_SIGNATURE_ALGORITHM:
         desc = "Certificate not signed with required signature algorithm";
         break;
     case CHIP_ERROR_WRONG_CHIP_SIGNATURE_ALGORITHM:
         desc = "CHIP signature not signed with required signature algorithm";
         break;
-    case CHIP_ERROR_WDM_SCHEMA_MISMATCH:
-        desc = "Schema mismatch in WDM.";
+    case CHIP_ERROR_SCHEMA_MISMATCH:
+        desc = "Schema mismatch";
         break;
     case CHIP_ERROR_INVALID_INTEGER_VALUE:
-        desc = "Invalid integer value.";
+        desc = "Invalid integer value";
         break;
     case CHIP_ERROR_CASE_RECONFIG_REQUIRED:
         desc = "CASE reconfiguration required";
         break;
     case CHIP_ERROR_TOO_MANY_CASE_RECONFIGURATIONS:
-        desc = "Too many CASE reconfigurations were received.";
+        desc = "Too many CASE reconfigurations were received";
         break;
     case CHIP_ERROR_BAD_REQUEST:
-        desc = "Request cannot be processed or fulfilled.";
+        desc = "Request cannot be processed or fulfilled";
         break;
     case CHIP_ERROR_INVALID_MESSAGE_FLAG:
-        desc = "Invalid message flag.";
+        desc = "Invalid message flag";
         break;
     case CHIP_ERROR_KEY_EXPORT_RECONFIGURE_REQUIRED:
-        desc = "Key export protocol required to reconfigure.";
+        desc = "Key export protocol required to reconfigure";
         break;
     case CHIP_ERROR_NO_COMMON_KEY_EXPORT_CONFIGURATIONS:
         desc = "No supported key export protocol configurations in common";
@@ -537,8 +537,8 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
     case CHIP_ERROR_TOO_MANY_SHARED_SESSION_END_NODES:
         desc = "Too many shared session end nodes";
         break;
-    case CHIP_ERROR_WDM_MALFORMED_DATA_ELEMENT:
-        desc = "Malformed WDM DataElement";
+    case CHIP_ERROR_MALFORMED_DATA_ELEMENT:
+        desc = "Malformed DataElement";
         break;
     case CHIP_ERROR_WRONG_CERT_TYPE:
         desc = "Wrong certificate type";
@@ -570,39 +570,24 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
     case CHIP_ERROR_MISMATCH_UPDATE_REQUIRED_VERSION:
         desc = "Update Required Version mismatch";
         break;
-    case CHIP_ERROR_WDM_MALFORMED_STATUS_ELEMENT:
-        desc = "Status Element in WDM update is malformed";
-        break;
-    case CHIP_ERROR_WDM_SUBSCRIPTIONLESS_NOTIFY_PARTIAL:
-        desc = "The WDM Subscriptionless Notify is partial";
-        break;
     case CHIP_ERROR_ACCESS_DENIED:
         desc = "The CHIP message is not granted access";
         break;
     case CHIP_ERROR_UNKNOWN_RESOURCE_ID:
         desc = "Unknown resource ID";
         break;
-    case CHIP_ERROR_WDM_MALFORMED_UPDATE_RESPONSE:
-        desc = "Malformed WDM Update response";
-        break;
-    case CHIP_ERROR_WDM_VERSION_MISMATCH:
-        desc = "The conditional update of a WDM path failed for a version mismatch";
-        break;
-    case CHIP_ERROR_WDM_POTENTIAL_DATA_LOSS:
-        desc = "A potential data loss was detected in a WDM Trait Instance";
+    case CHIP_ERROR_VERSION_MISMATCH:
+        desc = "Version mismatch";
         break;
     case CHIP_ERROR_UNSUPPORTED_THREAD_NETWORK_CREATE:
         desc = "Legacy device doesn't support standalone Thread network creation";
         break;
-    case CHIP_ERROR_WDM_INCONSISTENT_CONDITIONALITY:
+    case CHIP_ERROR_INCONSISTENT_CONDITIONALITY:
         desc = "The Trait Instance is already being updated with a different conditionality";
         break;
-    case CHIP_ERROR_WDM_LOCAL_DATA_INCONSISTENT:
+    case CHIP_ERROR_LOCAL_DATA_INCONSISTENT:
         desc = "The local data does not match any known version of the Trait Instance";
         break;
-    case CHIP_ERROR_WDM_PATH_STORE_FULL:
-        desc = "A WDM TraitPath store is full";
-        break;
     case CHIP_EVENT_ID_FOUND:
         desc = "Event ID matching criteria was found";
         break;