From e23f423ef701b273519da705bf5afb70ca55c5d0 Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Tue, 31 May 2022 19:32:52 -0400 Subject: [PATCH 1/4] [FOLD] Fix Roles test under IPv6 --- src/test/jtx/impl/envconfig.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/jtx/impl/envconfig.cpp b/src/test/jtx/impl/envconfig.cpp index 8cf416a4c5d..d278ce0e598 100644 --- a/src/test/jtx/impl/envconfig.cpp +++ b/src/test/jtx/impl/envconfig.cpp @@ -73,8 +73,8 @@ secure_gateway(std::unique_ptr cfg) std::unique_ptr admin_localnet(std::unique_ptr cfg) { - (*cfg)[PORT_RPC].set("admin", "127.0.0.0/8"); - (*cfg)[PORT_WS].set("admin", "127.0.0.0/8"); + (*cfg)[PORT_RPC].set("admin", "127.0.0.0/8,[::1]"); + (*cfg)[PORT_WS].set("admin", "127.0.0.0/8,[::1]"); return cfg; } @@ -83,8 +83,8 @@ secure_gateway_localnet(std::unique_ptr cfg) { (*cfg)[PORT_RPC].set("admin", ""); (*cfg)[PORT_WS].set("admin", ""); - (*cfg)[PORT_RPC].set("secure_gateway", "127.0.0.0/8"); - (*cfg)[PORT_WS].set("secure_gateway", "127.0.0.0/8"); + (*cfg)[PORT_RPC].set("secure_gateway", "127.0.0.0/8,[::1]"); + (*cfg)[PORT_WS].set("secure_gateway", "127.0.0.0/8,[::1]"); return cfg; } From 5f9c980e1fa90249d2bbebb4a489af587da32b73 Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Mon, 27 Mar 2023 20:31:31 -0400 Subject: [PATCH 2/4] Change priority of ValidatorSite test --- src/test/app/ValidatorSite_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp index be8ae8013f7..d99cfed8d26 100644 --- a/src/test/app/ValidatorSite_test.cpp +++ b/src/test/app/ValidatorSite_test.cpp @@ -688,7 +688,7 @@ class ValidatorSite_test : public beast::unit_test::suite } }; -BEAST_DEFINE_TESTSUITE_PRIO(ValidatorSite, app, ripple, 2); +BEAST_DEFINE_TESTSUITE_PRIO(ValidatorSite, app, ripple, 5); } // namespace test } // namespace ripple From cda7038bcae4060c6a3b660da7d9f435956910e4 Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Wed, 19 Apr 2023 12:07:51 -0400 Subject: [PATCH 3/4] [WIP] Checkpoint - diagnostic test log messages --- src/test/app/ValidatorSite_test.cpp | 5 +++++ src/test/jtx/TrustedPublisherServer.h | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp index d99cfed8d26..92e8fcc93b0 100644 --- a/src/test/app/ValidatorSite_test.cpp +++ b/src/test/app/ValidatorSite_test.cpp @@ -688,6 +688,11 @@ class ValidatorSite_test : public beast::unit_test::suite } }; +// Quick hack for TrustedPublisherServer definition so I don't have to +// make a cpp file +// static +std::atomic TrustedPublisherServer::counter = 0; + BEAST_DEFINE_TESTSUITE_PRIO(ValidatorSite, app, ripple, 5); } // namespace test diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h index 0f88e42f3dd..07838ab25a5 100644 --- a/src/test/jtx/TrustedPublisherServer.h +++ b/src/test/jtx/TrustedPublisherServer.h @@ -146,6 +146,9 @@ class TrustedPublisherServer 1)}; } + static std::atomic counter; + int const myNumber; + // TrustedPublisherServer must be accessed through a shared_ptr. // This constructor is only public so std::make_shared has access. // The function`make_TrustedPublisherServer` should be used to create @@ -172,7 +175,10 @@ class TrustedPublisherServer , useSSL_{useSSL} , publisherSecret_{randomSecretKey()} , publisherPublic_{derivePublicKey(KeyType::ed25519, publisherSecret_)} + , myNumber(++counter) { + std::cerr << "Creating TrustedPublisherServer #" << myNumber + << std::endl; auto const keys = randomKeyPair(KeyType::secp256k1); auto const manifest = makeManifestString( publisherPublic_, publisherSecret_, keys.first, keys.second, 1); @@ -289,6 +295,9 @@ class TrustedPublisherServer ~TrustedPublisherServer() { stop(); + std::cerr << "Destructing TrustedPublisherServer #" << myNumber + << std::endl; + --counter; } endpoint_type From c575f6922a95dac451030473f125cfee210c1efc Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Wed, 28 Jan 2026 20:26:55 -0500 Subject: [PATCH 4/4] Fix formatting --- src/test/jtx/TrustedPublisherServer.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h index d7fb3a2fc16..ad86cd668dc 100644 --- a/src/test/jtx/TrustedPublisherServer.h +++ b/src/test/jtx/TrustedPublisherServer.h @@ -150,8 +150,7 @@ class TrustedPublisherServer : public std::enable_shared_from_this