Merge 926fc2a into merged_master (Bitcoin PR bitcoin/bitcoin#23707)

delta1 · Jun 6, 2023 · c7c59a2 · c7c59a2
2 parents 8436894 + 926fc2a
commit c7c59a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/test/fuzz/rpc.cpp b/src/test/fuzz/rpc.cpp
@@ -382,7 +382,9 @@ FUZZ_TARGET_INIT(rpc, initialize_rpc)
         rpc_testing_setup->CallRPC(rpc_command, arguments);
     } catch (const UniValue& json_rpc_error) {
         const std::string error_msg{find_value(json_rpc_error, "message").get_str()};
-        if (error_msg.find("Internal bug detected") != std::string::npos) {
+        // Once c++20 is allowed, starts_with can be used.
+        // if (error_msg.starts_with("Internal bug detected")) {
+        if (0 == error_msg.rfind("Internal bug detected", 0)) {
             // Only allow the intentional internal bug
             assert(error_msg.find("trigger_internal_bug") != std::string::npos);
         }

diff --git a/src/util/check.h b/src/util/check.h
@@ -33,11 +33,11 @@ class NonFatalCheckError : public std::runtime_error
     do {                                                          \
         if (!(condition)) {                                       \
             throw NonFatalCheckError(                             \
-                strprintf("%s:%d (%s)\n"                          \
-                          "Internal bug detected: '%s'\n"         \
+                strprintf("Internal bug detected: '%s'\n"         \
+                          "%s:%d (%s)\n"                          \
                           "You may report this issue here: %s\n", \
-                    __FILE__, __LINE__, __func__,                 \
                     (#condition),                                 \
+                    __FILE__, __LINE__, __func__,                 \
                     PACKAGE_BUGREPORT));                          \
         }                                                         \
     } while (false)