From 58828b0ce9556ee9cb38c484d1226663a0dcd993 Mon Sep 17 00:00:00 2001 From: Billy Donahue Date: Wed, 9 Sep 2020 21:32:04 +0000 Subject: SERVER-43909 clarify and repair util/hex.h API - hexblob namespace - Throwy hexblob::decode (nee fromHex) - StringData overloads of hex codec ops - add unsignedHex and zeroPaddedHex --- src/mongo/rpc/op_msg_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mongo/rpc/op_msg_test.cpp') diff --git a/src/mongo/rpc/op_msg_test.cpp b/src/mongo/rpc/op_msg_test.cpp index 362d5fb5ef9..b22c661a551 100644 --- a/src/mongo/rpc/op_msg_test.cpp +++ b/src/mongo/rpc/op_msg_test.cpp @@ -656,15 +656,15 @@ void testSerializer(const Message& fromSerializer, OpMsgBytes&& expected) { LOGV2(22636, "Mismatch after {commonLength} bytes.", "commonLength"_attr = commonLength); LOGV2(22637, "Common prefix: {hexdump_gotSD_rawData_commonLength}", - "hexdump_gotSD_rawData_commonLength"_attr = hexdump(gotSD.rawData(), commonLength)); + "hexdump_gotSD_rawData_commonLength"_attr = hexdump(gotSD.substr(0, commonLength))); LOGV2(22638, "Got suffix : {hexdump_gotSD_rawData_commonLength_gotSD_size_commonLength}", "hexdump_gotSD_rawData_commonLength_gotSD_size_commonLength"_attr = - hexdump(gotSD.rawData() + commonLength, gotSD.size() - commonLength)); + hexdump(gotSD.substr(commonLength))); LOGV2(22639, "Expected suffix: {hexdump_expectedSD_rawData_commonLength_expectedSD_size_commonLength}", "hexdump_expectedSD_rawData_commonLength_expectedSD_size_commonLength"_attr = - hexdump(expectedSD.rawData() + commonLength, expectedSD.size() - commonLength)); + hexdump(expectedSD.substr(commonLength))); FAIL("Serialization didn't match expected data. See above for details."); } -- cgit v1.2.1