Skip to content

Commit

Permalink
Fix bip324 and descriptor tests
Browse files Browse the repository at this point in the history
  • Loading branch information
timemarkovqtum committed Apr 1, 2024
1 parent 4c2c7d0 commit 11fe439
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion src/bip324.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void BIP324Cipher::Initialize(const EllSwiftPubKey& their_pubkey, bool initiator
{
// Determine salt (fixed string + network magic bytes)
const auto& message_header = Params().MessageStart();
std::string salt = std::string{"bitcoin_v2_shared_secret"} + std::string(std::begin(message_header), std::end(message_header));
std::string salt = std::string{"qtum_v2_shared_secret"} + std::string(std::begin(message_header), std::end(message_header));

// Perform ECDH to derive shared secret.
ECDHSecret ecdh_secret = m_key.ComputeBIP324ECDHSecret(their_pubkey, m_our_pubkey, initiator);
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/node.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class Node
virtual int getExitStatus() = 0;

// Get log flags.
virtual uint32_t getLogCategories() = 0;
virtual uint64_t getLogCategories() = 0;

//! Initialize app dependencies.
virtual bool baseInitialize() = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/logging.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ namespace BCLog {
std::atomic<Level> m_log_level{DEFAULT_LOG_LEVEL};

/** Log categories bitfield. */
std::atomic<uint32_t> m_categories{0};
std::atomic<uint64_t> m_categories{0};

std::string LogTimestampStr(const std::string& str);

Expand Down Expand Up @@ -191,7 +191,7 @@ namespace BCLog {
void SetLogLevel(Level level) { m_log_level = level; }
bool SetLogLevel(const std::string& level);

uint32_t GetCategoryMask() const { return m_categories.load(); }
uint64_t GetCategoryMask() const { return m_categories.load(); }

void EnableCategory(LogFlags flag);
bool EnableCategory(const std::string& str);
Expand Down
2 changes: 1 addition & 1 deletion src/node/interfaces.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class NodeImpl : public Node
void initParameterInteraction() override { InitParameterInteraction(args()); }
bilingual_str getWarnings() override { return GetWarnings(true); }
int getExitStatus() override { return Assert(m_context)->exit_status.load(); }
uint32_t getLogCategories() override { return LogInstance().GetCategoryMask(); }
uint64_t getLogCategories() override { return LogInstance().GetCategoryMask(); }
bool baseInitialize() override
{
if (!AppInitBasicSetup(args(), Assert(context())->exit_status)) return false;
Expand Down
6 changes: 3 additions & 3 deletions src/rpc/node.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,15 @@ static RPCHelpMan logging()
},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
uint32_t original_log_categories = LogInstance().GetCategoryMask();
uint64_t original_log_categories = LogInstance().GetCategoryMask();
if (request.params[0].isArray()) {
EnableOrDisableLogCategories(request.params[0], true);
}
if (request.params[1].isArray()) {
EnableOrDisableLogCategories(request.params[1], false);
}
uint32_t updated_log_categories = LogInstance().GetCategoryMask();
uint32_t changed_log_categories = original_log_categories ^ updated_log_categories;
uint64_t updated_log_categories = LogInstance().GetCategoryMask();
uint64_t changed_log_categories = original_log_categories ^ updated_log_categories;

// Update libevent logging if BCLog::LIBEVENT has changed.
if (changed_log_categories & BCLog::LIBEVENT) {
Expand Down
56 changes: 28 additions & 28 deletions src/test/bip324_tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ BOOST_AUTO_TEST_CASE(packet_test_vectors) {
1,
"",
false,
"faef555dfcdb936425d84aba524758f3",
"02cb8ff24307a6e27de3b4e7ea3fa65b",
"ce72dffb015da62b0d0f5474cab8bc72605225b0cee3f62312ec680ec5f41ba5",
"7530d2a18720162ac09c25329a60d75adf36eda3c3",
"72c409b5c55324849b45d0842e13bb59",
"3354d4886a158c92404be4026f080320",
"cdd0d52b66516706501aaee962ec552c8090202f941b86792dd1fcb37319e480",
"58112c316efa0c0af628be1e05b19668b8b40d12a7",
"");
TestBIP324PacketVector(
999,
Expand All @@ -215,10 +215,10 @@ BOOST_AUTO_TEST_CASE(packet_test_vectors) {
1,
"",
false,
"efb64fd80acd3825ac9bc2a67216535a",
"b3cb553453bceb002897e751ff7588bf",
"9267c54560607de73f18c563b76a2442718879c52dd39852885d4a3c9912c9ea",
"1da1bcf589f9b61872f45b7fa5371dd3f8bdf5d515b0c5f9fe9f0044afb8dc0aa1cd39a8c4",
"daed1c6c925f2f673b26890c454099e8",
"67e3561c7626c9fcaea74a5c450bea34",
"740a25b8387131eeda267c5632c2799100603f65911dbed31767a4f604b5c979",
"5364dc71b5227190780a7cb4def827f3a0fe4193b0ba51e760be71475ea9babfc63b85ac3f",
"");
TestBIP324PacketVector(
0,
Expand All @@ -230,10 +230,10 @@ BOOST_AUTO_TEST_CASE(packet_test_vectors) {
1,
"84932a55aac22b51e7b128d31d9f0550da28e6a3f394224707d878603386b2f9d0c6bcd8046679bfed7b68c517e7431e75d9dd34605727d2ef1c2babbf680ecc8d68d2c4886e9953a4034abde6da4189cd47c6bb3192242cf714d502ca6103ee84e08bc2ca4fd370d5ad4e7d06c7fbf496c6c7cc7eb19c40c61fb33df2a9ba48497a96c98d7b10c1f91098a6b7b16b4bab9687f27585ade1491ae0dba6a79e1e2d85dd9d9d45c5135ca5fca3f0f99a60ea39edbc9efc7923111c937913f225d67788d5f7e8852b697e26b92ec7bfcaa334a1665511c2b4c0a42d06f7ab98a9719516c8fd17f73804555ee84ab3b7d1762f6096b778d3cb9c799cbd49a9e4a325197b4e6cc4a5c4651f8b41ff88a92ec428354531f970263b467c77ed11312e2617d0d53fe9a8707f51f9f57a77bfb49afe3d89d85ec05ee17b9186f360c94ab8bb2926b65ca99dae1d6ee1af96cad09de70b6767e949023e4b380e66669914a741ed0fa420a48dbc7bfae5ef2019af36d1022283dd90655f25eec7151d471265d22a6d3f91dc700ba749bb67c0fe4bc0888593fbaf59d3c6fff1bf756a125910a63b9682b597c20f560ecb99c11a92c8c8c3f7fbfaa103146083a0ccaecf7a5f5e735a784a8820155914a289d57d8141870ffcaf588882332e0bcd8779efa931aa108dab6c3cce76691e345df4a91a03b71074d66333fd3591bff071ea099360f787bbe43b7b3dff2a59c41c7642eb79870222ad1c6f2e5a191ed5acea51134679587c9cf71c7d8ee290be6bf465c4ee47897a125708704ad610d8d00252d01959209d7cd04d5ecbbb1419a7e84037a55fefa13dee464b48a35c96bcb9a53e7ed461c3a1607ee00c3c302fd47cd73fda7493e947c9834a92d63dcfbd65aa7c38c3e3a2748bb5d9a58e7495d243d6b741078c8f7ee9c8813e473a323375702702b0afae1550c8341eedf5247627343a95240cb02e3e17d5dca16f8d8d3b2228e19c06399f8ec5c5e9dbe4caef6a0ea3ffb1d3c7eac03ae030e791fa12e537c80d56b55b764cadf27a8701052df1282ba8b5e3eb62b5dc7973ac40160e00722fa958d95102fc25c549d8c0e84bed95b7acb61ba65700c4de4feebf78d13b9682c52e937d23026fb4c6193e6644e2d3c99f91f4f39a8b9fc6d013f89c3793ef703987954dc0412b550652c01d922f525704d32d70d6d4079bc3551b563fb29577b3aecdc9505011701dddfd94830431e7a4918927ee44fb3831ce8c4513839e2deea1287f3fa1ab9b61a256c09637dbc7b4f0f8fbb783840f9c24526da883b0df0c473cf231656bd7bc1aaba7f321fec0971c8c2c3444bff2f55e1df7fea66ec3e440a612db9aa87bb505163a59e06b96d46f50d8120b92814ac5ab146bc78dbbf91065af26107815678ce6e33812e6bf3285d4ef3b7b04b076f21e7820dcbfdb4ad5218cf4ff6a65812d8fcb98ecc1e95e2fa58e3efe4ce26cd0bd400d6036ab2ad4f6c713082b5e3f1e04eb9e3b6c8f63f57953894b9e220e0130308e1fd91f72d398c1e7962ca2c31be83f31d6157633581a0a6910496de8d55d3d07090b6aa087159e388b7e7dec60f5d8a60d93ca2ae91296bd484d916bfaaa17c8f45ea4b1a91b37c82821199a2b7596672c37156d8701e7352aa48671d3b1bbbd2bd5f0a2268894a25b0cb2514af39c8743f8cce8ab4b523053739fd8a522222a09acf51ac704489cf17e4b7125455cb8f125b4d31af1eba1f8cf7f81a5a100a141a7ee72e8083e065616649c241f233645c5fc865d17f0285f5c52d9f45312c979bfb3ce5f2a1b951deddf280ffb3f370410cffd1583bfa90077835aa201a0712d1dcd1293ee177738b14e6b5e2a496d05220c3253bb6578d6aff774be91946a614dd7e879fb3dcf7451e0b9adb6a8c44f53c2c464bcc0019e9fad89cac7791a0a3f2974f759a9856351d4d2d7c5612c17cfc50f8479945df57716767b120a590f4bf656f4645029a525694d8a238446c5f5c2c1c995c09c1405b8b1eb9e0352ffdf766cc964f8dcf9f8f043dfab6d102cf4b298021abd78f1d9025fa1f8e1d710b38d9d1652f2d88d1305874ec41609b6617b65c5adb19b6295dc5c5da5fdf69f28144ea12f17c3c6fcce6b9b5157b3dfc969d6725fa5b098a4d9b1d31547ed4c9187452d281d0a5d456008caf1aa251fac8f950ca561982dc2dc908d3691ee3b6ad3ae3d22d002577264ca8e49c523bd51c4846be0d198ad9407bf6f7b82c79893eb2c05fe9981f687a97a4f01fe45ff8c8b7ecc551135cd960a0d6001ad35020be07ffb53cb9e731522ca8ae9364628914b9b8e8cc2f37f03393263603cc2b45295767eb0aac29b0930390eb89587ab2779d2e3decb8042acece725ba42eda650863f418f8d0d50d104e44fbbe5aa7389a4a144a8cecf00f45fb14c39112f9bfb56c0acbd44fa3ff261f5ce4acaa5134c2c1d0cca447040820c81ab1bcdc16aa075b7c68b10d06bbb7ce08b5b805e0238f24402cf24a4b4e00701935a0c68add3de090903f9b85b153cb179a582f57113bfc21c2093803f0cfa4d9d4672c2b05a24f7e4c34a8e9101b70303a7378b9c50b6cddd46814ef7fd73ef6923feceab8fc5aa8b0d185f2e83c7a99dcb1077c0ab5c1f5d5f01ba2f0420443f75c4417db9ebf1665efbb33dca224989920a64b44dc26f682cc77b4632c8454d49135e52503da855bc0f6ff8edc1145451a9772c06891f41064036b66c3119a0fc6e80dffeb65dc456108b7ca0296f4175fff3ed2b0f842cd46bd7e86f4c62dfaf1ddbf836263c00b34803de164983d0811cebfac86e7720c726d3048934c36c23189b02386a722ca9f0fe00233ab50db928d3bccea355cc681144b8b7edcaae4884d5a8f04425c0890ae2c74326e138066d8c05f4c82b29df99b034ea727afde590a1f2177ace3af99cfb1729d6539ce7f7f7314b046aab74497e63dd399e1f7d5f16517c23bd830d1fdee810f3c3b77573dd69c4b97d80d71fb5a632e00acdfa4f8e829faf3580d6a72c40b28a82172f8dcd4627663ebf6069736f21735fd84a226f427cd06bb055f94e7c92f31c48075a2955d82a5b9d2d0198ce0d4e131a112570a8ee40fb80462a81436a58e7db4e34b6e2c422e82f934ecda9949893da5730fc5c23c7c920f363f85ab28cc6a4206713c3152669b47efa8238fa826735f17b4e78750276162024ec85458cd5808e06f40dd9fd43775a456a3ff6cae90550d76d8b2899e0762ad9a371482b3e38083b1274708301d6346c22fea9bb4b73db490ff3ab05b2f7f9e187adef139a7794454b7300b8cc64d3ad76c0e4bc54e08833a4419251550655380d675bc91855aeb82585220bb97f03e976579c08f321b5f8f70988d3061f41465517d53ac571dbf1b24b94443d2e9a8e8a79b392b3d6a4ecdd7f626925c365ef6221305105ce9b5f5b6ecc5bed3d702bd4b7f5008aa8eb8c7aa3ade8ecf6251516fbefeea4e1082aa0e1848eddb31ffe44b04792d296054402826e4bd054e671f223e5557e4c94f89ca01c25c44f1a2ff2c05a70b43408250705e1b858bf0670679fdcd379203e36be3500dd981b1a6422c3cf15224f7fefdef0a5f225c5a09d15767598ecd9e262460bb33a4b5d09a64591efabc57c923d3be406979032ae0bc0997b65336a06dd75b253332ad6a8b63ef043f780a1b3fb6d0b6cad98b1ef4a02535eb39e14a866cfc5fc3a9c5deb2261300d71280ebe66a0776a151469551c3c5fa308757f956655278ec6330ae9e3625468c5f87e02cd9a6489910d4143c1f4ee13aa21a6859d907b788e28572fecee273d44e4a900fa0aa668dd861a60fb6b6b12c2c5ef3c8df1bd7ef5d4b0d1cdb8c15fffbb365b9784bd94abd001c6966216b9b67554ad7cb7f958b70092514f7800fc40244003e0fd1133a9b850fb17f4fcafde07fc87b07fb510670654a5d2d6fc9876ac74728ea41593beef003d6858786a52d3a40af7529596767c17000bfaf8dc52e871359f4ad8bf6e7b2853e5229bdf39657e213580294a5317c5df172865e1e17fe37093b585e04613f5f078f761b2b1752eb32983afda24b523af8851df9a02b37e77f543f18888a782a994a50563334282bf9cdfccc183fdf4fcd75ad86ee0d94f91ee2300a5befbccd14e03a77fc031a8cfe4f01e4c5290f5ac1da0d58ea054bd4837cfd93e5e34fc0eb16e48044ba76131f228d16cde9b0bb978ca7cdcd10653c358bdb26fdb723a530232c32ae0a4cecc06082f46e1c1d596bfe60621ad1e354e01e07b040cc7347c016653f44d926d13ca74e6cbc9d4ab4c99f4491c95c76fff5076b3936eb9d0a286b97c035ca88a3c6309f5febfd4cdaac869e4f58ed409b1e9eb4192fb2f9c2f12176d460fd98286c9d6df84598f260119fd29c63f800c07d8df83d5cc95f8c2fea2812e7890e8a0718bb1e031ecbebc0436dcf3e3b9a58bcc06b4c17f711f80fe1dffc3326a6eb6e00283055c6dabe20d311bfd5019591b7954f8163c9afad9ef8390a38f3582e0a79cdf0353de8eeb6b5f9f27b16ffdef7dd62869b4840ee226ccdce95e02c4545eb981b60571cd83f03dc5eaf8c97a0829a4318a9b3dc06c0e003db700b2260ff1fa8fee66890e637b109abb03ec901b05ca599775f48af50154c0e67d82bf0f558d7d3e0778dc38bea1eb5f74dc8d7f90abdf5511a424be66bf8b6a3cacb477d2e7ef4db68d2eba4d5289122d851f9501ba7e9c4957d8eba3be3fc8e785c4265a1d65c46f2809b70846c693864b169c9dcb78be26ea14b8613f145b01887222979a9e67aee5f800caa6f5c4229bdeefc901232ace6143c9865e4d9c07f51aa200afaf7e48a7d1d8faf366023beab12906ffcb3eaf72c0eb68075e4daf3c080e0c31911befc16f0cc4a09908bb7c1e26abab38bd7b788e1a09c0edf1a35a38d2ff1d3ed47fcdaae2f0934224694f5b56705b9409b6d3d64f3833b686f7576ec64bbdd6ff174e56c2d1edac0011f904681a73face26573fbba4e34652f7ae84acfb2fa5a5b3046f98178cd0831df7477de70e06a4c00e305f31aafc026ef064dd68fd3e4252b1b91d617b26c6d09b6891a00df68f105b5962e7f9d82da101dd595d286da721443b72b2aba2377f6e7772e33b3a5e3753da9c2578c5d1daab80187f55518c72a64ee150a7cb5649823c08c9f62cd7d020b45ec2cba8310db1a7785a46ab24785b4d54ff1660b5ca78e05a9a55edba9c60bf044737bc468101c4e8bd1480d749be5024adefca1d998abe33eaeb6b11fbb39da5d905fdd3f611b2e51517ccee4b8af72c2d948573505590d61a6783ab7278fc43fe55b1fcc0e7216444d3c8039bb8145ef1ce01c50e95a3f3feab0aee883fdb94cc13ee4d21c542aa795e18932228981690f4d4c57ca4db6eb5c092e29d8a05139d509a8aeb48baa1eb97a76e597a32b280b5e9d6c36859064c98ff96ef5126130264fa8d2f49213870d9fb036cff95da51f270311d9976208554e48ffd486470d0ecdb4e619ccbd8226147204baf8e235f54d8b1cba8fa34a9a4d055de515cdf180d2bb6739a175183c472e30b5c914d09eeb1b7dafd6872b38b48c6afc146101200e6e6a44fe5684e220adc11f5c403ddb15df8051e6bdef09117a3a5349938513776286473a3cf1d2788bb875052a2e6459fa7926da33380149c7f98d7700528a60c954e6f5ecb65842fde69d614be69eaa2040a4819ae6e756accf936e14c1e894489744a79c1f2c1eb295d13e2d767c09964b61f9cfe497649f712",
false,
"d4e3f18ac2e2095edb5c3b94236118ad",
"4faa6c4233d9fd53d170ede4172142a8",
"23f154ac43cfc59c4243e9fc68aeec8f19ad3942d74108e833b36f0dd3dcd357",
"8da7de6ea7bf2a81a396a42880ba1f5756734c4821309ac9aeffa2a26ce86873b9dc4935a772de6ec5162c6d075b14536800fb174841153511bfb597e992e2fe8a450c4bce102cc550bb37fd564c4d60bf884e",
"b3a84aec626079978de57a105a166499",
"eaa8dc25ae3541d5899982c91b3298df",
"249aaddcfa478879be22151cf2b6fa503ca9f8239f32da490e7e630ddedfeb82",
"f897f2be7e3aa87f7a20b8dcf5e61460606b6a8668ef780aff1f088283a930f5181e6b17beff01551010b9b383cade9ee10e19ea1d89c119301438c7cb3acd88f33d14ac78a24a4ffd5062cf67052a1829bbf7",
"");
TestBIP324PacketVector(
223,
Expand All @@ -245,11 +245,11 @@ BOOST_AUTO_TEST_CASE(packet_test_vectors) {
1,
"",
true,
"cf2e25f23501399f30738d7eee652b90",
"225a477a28a54ea7671d2b217a9c29db",
"7ec02fea8c1484e3d0875f978c5f36d63545e2e4acf56311394422f4b66af612",
"ddd7e7c2c102bb913fca6f7166e85f71",
"1bc09216fcd7dec87259a37ddef2b060",
"ceb60d7edd50c82896973739572042eca0bf71d64a483597b8cfce8857f6c09a",
"",
"729847a3e9eba7a5bff454b5de3b393431ee360736b6c030d7a5bd01d1203d2e98f528543fd2bf886ccaa1ada5e215a730a36b3f4abfc4e252c89eb01d9512f94916dae8a76bf16e4da28986ffe159090fe5267ee3394300b7ccf4dfad389a26321b3a3423e4594a82ccfbad16d6561ecb8772b0cb040280ff999a29e3d9d4fd");
"d670ea48e459b64736607d2e9f70b26385303891fa2148b440622a883f892bf9ecaaf3e5e734ff8d1e709fdfcb6cdf0e404e1bf1184910254523869746ba00d3a44ff04d05aa408407c45632c20eec8c9ee7cb7182604a52696e815b48170d33e2004cb048e6662614739c766ad0609a4030205b56fd7fd88bfb479aeb35565d");
TestBIP324PacketVector(
448,
"a6ec25127ca1aa4cf16b20084ba1e6516baae4d32422288e9b36d8bddd2de35a",
Expand All @@ -260,11 +260,11 @@ BOOST_AUTO_TEST_CASE(packet_test_vectors) {
1,
"",
false,
"fead69be77825a23daec377c362aa560",
"511d4980526c5e64aa7187462faeafdd",
"acb8f084ea763ddd1b92ac4ed23bf44de20b84ab677d4e4e6666a6090d40353d",
"a1ef679ab243d723800d4db036686966",
"d965df7f7e7535ebc01f8e7aef18cd75",
"80152709e09d0d56e260bebd49b99a334213f23ada3110f9185c525f5bddb22c",
"",
"77b4656934a82de1a593d8481f020194ddafd8cac441f9d72aeb8721e6a14f49698ca6d9b2b6d59d07a01aa552fd4d5b68d0d1617574c77dea10bfadbaa31b83885b7ceac2fd45e3e4a331c51a74e7b1698d81b64c87c73c5b9258b4d83297f9debc2e9aa07f8572ff434dc792b83ecf07b3197de8dc9cf7be56acb59c66cff5");
"fef007888e82a88d1c480a16026a479d7c377b5a74d8cabff8b73555bfc06a9fa9c3934f158c31795b8ae511eeb831141d215512f9a40ee14e963b7155ae0237c23af2b316512acd57567b9a432610766076511a24e3e9a508890dbbc76d730d2b582f2ca7ba039f23b213882d199502201cffae36c0124d8f5c26179a2b75c3");
TestBIP324PacketVector(
673,
"0af952659ed76f80f585966b95ab6e6fd68654672827878684c8b547b1b94f5a",
Expand All @@ -275,11 +275,11 @@ BOOST_AUTO_TEST_CASE(packet_test_vectors) {
97561,
"",
false,
"5e2375ac629b8df1e4ff3617c6255a70",
"70bcbffcb62e4d29d2605d30bceef137",
"7332e92a3f9d2792c4d444fac5ed888c39a073043a65eefb626318fd649328f8",
"3db798ee15b782ae2064fa990ea532c6",
"bc9778e49911c24bdad659ee0ff99cdc",
"a899517774cb11b7616b56c961da54e054eb3c2a55a44c96bf326db7d53c9127",
"",
"657a4a19711ce593c3844cb391b224f60124aba7e04266233bc50cafb971e26c7716b76e98376448f7d214dd11e629ef9a974d60e3770a695810a61c4ba66d78b936ee7892b98f0b48ddae9fcd8b599dca1c9b43e9b95e0226cf8d4459b8a7c2c4e6db80f1d58c7b20dd7208fa5c1057fb78734223ee801dbd851db601fee61e");
"a8911641321e6440ad6af7ddc9ab1799a3ebfadb3ef538cc14797bf325eb3a14ed01bd62d068339664a1912985e460df6483a206e1e1b5068bb68baf6e75770b2d5746b4af2377c86cc0cc004ece227899a49f6679d3cd3184b9858ee76ffb86516f1d7940ceec7fe9d2b1775a992c41f25769226497af089235c5e89f5368bf");
TestBIP324PacketVector(
1024,
"f90e080c64b05824c5a24b2501d5aeaf08af3872ee860aa80bdcd430f7b63494",
Expand All @@ -290,11 +290,11 @@ BOOST_AUTO_TEST_CASE(packet_test_vectors) {
69615,
"",
true,
"b709dea25e0be287c50e3603482c2e98",
"1f677e9d7392ebe3633fd82c9efb0f16",
"889f339285564fd868401fac8380bb9887925122ec8f31c8ae51ce067def103b",
"ce0dcd7671f494f3523c7219a591724a",
"aa4bb245b68f756488de10724f8b37ce",
"38f591661ad76549ab41e200f1e167ef5eec203aaa939c7dd968a448b53548f1",
"",
"7c4b9e1e6c1ce69da7b01513cdc4588fd93b04dafefaf87f31561763d906c672bac3dfceb751ebd126728ac017d4d580e931b8e5c7d5dfe0123be4dc9b2d2238b655c8a7fadaf8082c31e310909b5b731efc12f0a56e849eae6bfeedcc86dd27ef9b91d159256aa8e8d2b71a311f73350863d70f18d0d7302cf551e4303c7733");
"b96b3b01b58ca6a7330abe2b314dfe3ecf9766bb8dd86b8ce2a2f0e79fc3ec2e28054dd6dc4060f4f55f3facd83a8d319dffc49e1a87c614cbc00974b37d1618526a054b3791b3fab8b1b9d5e5d3409e850f6280bdb56a742431e69b0a393c8b4d58ccc4c2361875e12a36f34fc1fbbd19b419f689b1f0e0ac0552074d1acf52");
}

BOOST_AUTO_TEST_SUITE_END()
4 changes: 2 additions & 2 deletions src/test/blockmanager_tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ BOOST_AUTO_TEST_CASE(blockmanager_flush_block_file)
CBlock block3;
block3.nVersion = 3;

// They are 80 bytes header + 1 byte 0x00 for vtx length
constexpr int TEST_BLOCK_SIZE{81};
// They are 181 bytes header + 1 byte 0x00 for vtx length
constexpr int TEST_BLOCK_SIZE{182};

// Blockstore is empty
BOOST_CHECK_EQUAL(blockman.CalculateCurrentUsage(), 0);
Expand Down
Loading

0 comments on commit 11fe439

Please sign in to comment.