Remove a lot of nlio dependencies, enable TestUDP (#31802)

* Enable TestUDP and remove nlbyteorder include

* Drop some nlio dependencies ... I am not sure they are needed

* Drop a lot of nlio dependencies all over the place

* Split out chipencoding as a standalone

* Restyle

BUILD.gn

@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/mbedtls.gni")
 import("//build_overrides/nlassert.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
 
@@ -136,7 +135,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       "${chip_root}/src/system",
       "${chip_root}/src/transport",
       "${nlassert_root}:nlassert",
-      "${nlio_root}:nlio",
       "${nlunit_test_root}:nlunit-test",
     ]
 

src/inet/BUILD.gn

@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/nlassert.gni")
 import("//build_overrides/nlfaultinjection.gni")
-import("//build_overrides/nlio.gni")
 
 import("${chip_root}/build/chip/buildconfig_header.gni")
 import("${chip_root}/build/chip/tests.gni")
@@ -104,7 +103,6 @@ static_library("inet") {
     "${chip_root}/src/lib/support",
     "${chip_root}/src/platform:platform_config_header",
     "${chip_root}/src/system",
-    "${nlio_root}:nlio",
   ]
 
   if (chip_system_config_use_lwip) {

src/lib/core/BUILD.gn

@@ -104,6 +104,11 @@ source_set("error") {
   ]
 }
 
+source_set("encoding") {
+  sources = [ "CHIPEncoding.h" ]
+  public_deps = [ "${nlio_root}:nlio" ]
+}
+
 source_set("types") {
   sources = [
     "CHIPSafeCasts.h",
@@ -128,7 +133,6 @@ static_library("core") {
     "CASEAuthTag.h",
     "CHIPCallback.h",
     "CHIPCore.h",
-    "CHIPEncoding.h",
     "CHIPKeyIds.cpp",
     "CHIPKeyIds.h",
     "CHIPPersistentStorageDelegate.h",
@@ -172,7 +176,6 @@ static_library("core") {
     "${chip_root}/src/inet",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/system",
-    "${nlio_root}:nlio",
   ]
 
   allow_circular_includes_from = [

src/lib/support/BUILD.gn

@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/nlassert.gni")
 import("//build_overrides/nlfaultinjection.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
 
@@ -256,12 +255,12 @@ static_library("support") {
     ":verifymacros",
     ":verifymacros_no_logging",
     "${chip_root}/src/lib/core:chip_config_header",
+    "${chip_root}/src/lib/core:encoding",
     "${chip_root}/src/lib/core:error",
     "${chip_root}/src/lib/core:types",
     "${chip_root}/src/platform:platform_config_header",
     "${chip_root}/src/system:system_config_header",
     "${nlassert_root}:nlassert",
-    "${nlio_root}:nlio",
   ]
 
   # These are needed because we include CHIPCore.h, which uses config

src/messaging/tests/BUILD.gn

@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -37,7 +36,6 @@ static_library("helpers") {
     "${chip_root}/src/protocols",
     "${chip_root}/src/transport",
     "${chip_root}/src/transport/tests:helpers",
-    "${nlio_root}:nlio",
   ]
 }
 
@@ -78,7 +76,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/protocols",
     "${chip_root}/src/transport",
     "${chip_root}/src/transport/raw/tests:helpers",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

src/platform/BUILD.gn

@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/pigweed.gni")
 
 import("${build_root}/config/linux/pkg_config.gni")

src/platform/Linux/ThreadStackManagerImpl.cpp

@@ -28,10 +28,6 @@
 
 #include <app-common/zap-generated/ids/Attributes.h>
 
-#include <nlbyteorder.hpp>
-#include <nlio-byteorder.hpp>
-#include <nlio.hpp>
-
 using namespace ::chip::app;
 using namespace ::chip::app::Clusters;
 using namespace chip::DeviceLayer::NetworkCommissioning;

src/platform/webos/ThreadStackManagerImpl.cpp

@@ -27,10 +27,6 @@
 
 #include <app-common/zap-generated/ids/Attributes.h>
 
-#include <nlbyteorder.hpp>
-#include <nlio-byteorder.hpp>
-#include <nlio.hpp>
-
 using namespace ::chip::app;
 using namespace ::chip::app::Clusters;
 using namespace chip::DeviceLayer::NetworkCommissioning;

src/protocols/bdx/tests/BUILD.gn

@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -33,7 +32,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/lib/support",
     "${chip_root}/src/lib/support:testing_nlunit",
     "${chip_root}/src/protocols/bdx",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

src/protocols/secure_channel/tests/BUILD.gn

@@ -1,6 +1,5 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("${chip_root}/build/chip/chip_test_suite.gni")
 import("${chip_root}/src/app/icd/icd.gni")
@@ -35,7 +34,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/protocols",
     "${chip_root}/src/protocols/secure_channel",
     "${chip_root}/src/transport/raw/tests:helpers",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

src/protocols/user_directed_commissioning/tests/BUILD.gn

@@ -12,7 +12,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -27,7 +26,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/lib/support",
     "${chip_root}/src/lib/support:testing_nlunit",
     "${chip_root}/src/protocols",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

src/transport/BUILD.gn

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/pigweed.gni")
 import("${chip_root}/src/ble/ble.gni")
 import("${chip_root}/src/lib/core/core.gni")
@@ -68,7 +67,6 @@ static_library("transport") {
     "${chip_root}/src/tracing",
     "${chip_root}/src/tracing:macros",
     "${chip_root}/src/transport/raw",
-    "${nlio_root}:nlio",
   ]
 
   if (chip_enable_transport_trace) {

src/transport/raw/tests/BUILD.gn

@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -43,6 +42,7 @@ chip_test_suite_using_nltest("tests") {
     "TestMessageHeader.cpp",
     "TestPeerAddress.cpp",
     "TestTCP.cpp",
+    "TestUDP.cpp",
   ]
 
   public_deps = [
@@ -54,7 +54,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/lib/support:testing_nlunit",
     "${chip_root}/src/transport",
     "${chip_root}/src/transport/raw",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

src/transport/raw/tests/TestTCP.cpp

@@ -34,7 +34,6 @@
 #include <transport/TransportMgr.h>
 #include <transport/raw/TCP.h>
 
-#include <nlbyteorder.h>
 #include <nlunit-test.h>
 
 #include <errno.h>

src/transport/raw/tests/TestUDP.cpp

@@ -30,7 +30,6 @@
 #include <transport/TransportMgr.h>
 #include <transport/raw/UDP.h>
 
-#include <nlbyteorder.h>
 #include <nlunit-test.h>
 
 #include <errno.h>
@@ -196,7 +195,7 @@ static nlTestSuite sSuite =
  */
 static int Initialize(void * aContext)
 {
-    CHIP_ERROR err = reinterpret_cast<TestContext *>(aContext)->Init(&sSuite);
+    CHIP_ERROR err = reinterpret_cast<TestContext *>(aContext)->Init();
     return (err == CHIP_NO_ERROR) ? SUCCESS : FAILURE;
 }
 

src/transport/retransmit/tests/BUILD.gn

@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -32,7 +31,6 @@ chip_test_suite_using_nltest("tests") {
   public_deps = [
     "${chip_root}/src/lib/support:testing_nlunit",
     "${chip_root}/src/transport/retransmit",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 

src/transport/tests/BUILD.gn

@@ -14,7 +14,6 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
@@ -59,7 +58,6 @@ chip_test_suite_using_nltest("tests") {
     "${chip_root}/src/protocols",
     "${chip_root}/src/transport",
     "${chip_root}/src/transport/tests:helpers",
-    "${nlio_root}:nlio",
     "${nlunit_test_root}:nlunit-test",
   ]
 }