From aa24fc212601984a34a9c416fb41f97054ab14a0 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 9 Jan 2025 14:44:36 +0400 Subject: [PATCH 1/3] Delete unused tests/data directory --- ...144eec48bb477733d70ce5f9b85338a07cb10b849ad8fb | Bin 215 -> 0 bytes ...321773df5e5aaace00fe767c4f09de452838575357ca9f | Bin 215 -> 0 bytes ...e9ca8fe4c0659f6959b2bebb15079cdaed07a442a78486 | Bin 215 -> 0 bytes ...980fd2331715a631f5729db284eb1fc6f108aeb7a7f4fe | Bin 215 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/data/account-002bee2f8e16f5de4db0d3b8ce9227c8c0b7f9688348b028e022cb43f210968b40a69cdc8531fd4a2e7c9e144eec48bb477733d70ce5f9b85338a07cb10b849ad8fb delete mode 100644 tests/data/account-007af2d7c5ffd8f69005debae820207820805e28c7d7a16714591143f56fb51e2b91ad0c1a535567e6292b321773df5e5aaace00fe767c4f09de452838575357ca9f delete mode 100644 tests/data/account-009b82d66dfaaba55a581913fa09d6c5bebe179cd73731781265c96e9e630dcd27fd5d20e7f1d0fa42619de9ca8fe4c0659f6959b2bebb15079cdaed07a442a78486 delete mode 100644 tests/data/account-00aff84db50d6a54dd56051379f6c336fdd330d1cb11e7523bbf71f30b1ae760fa47ace8679b6486f79429980fd2331715a631f5729db284eb1fc6f108aeb7a7f4fe diff --git a/tests/data/account-002bee2f8e16f5de4db0d3b8ce9227c8c0b7f9688348b028e022cb43f210968b40a69cdc8531fd4a2e7c9e144eec48bb477733d70ce5f9b85338a07cb10b849ad8fb b/tests/data/account-002bee2f8e16f5de4db0d3b8ce9227c8c0b7f9688348b028e022cb43f210968b40a69cdc8531fd4a2e7c9e144eec48bb477733d70ce5f9b85338a07cb10b849ad8fb deleted file mode 100644 index 11927eccaa17745a415f3f7b565a08ee1d057fe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmWe*fPmuEqRhmc%&Nqa%=|nntHh$@jLfoBE(R7377j+J8VIEToI9d@!0KNZhW2R>CYX(77J=Na<|O70aG`noB#C8 hKEu?+74EzEHvHDMe>Z_b2Ta}HScT^wFZ^;!ocr=r|C0l$^D`qi?b|KNKIhh3_9afsTVU!YOyYUD h{_wW6TdVW6TBYBnA5AdYce}=&>uP0N;YsmuE&y;PNxA?4 diff --git a/tests/data/account-00aff84db50d6a54dd56051379f6c336fdd330d1cb11e7523bbf71f30b1ae760fa47ace8679b6486f79429980fd2331715a631f5729db284eb1fc6f108aeb7a7f4fe b/tests/data/account-00aff84db50d6a54dd56051379f6c336fdd330d1cb11e7523bbf71f30b1ae760fa47ace8679b6486f79429980fd2331715a631f5729db284eb1fc6f108aeb7a7f4fe deleted file mode 100644 index 54122832c8bba776aecbce74473cace9cc25bd4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmWe*fPmuEqRhmc%&Nqa%=|nntHh$@jLfoBE(R7377j+J8VIET<*onWyOlR9 Date: Thu, 16 Jan 2025 04:23:04 +0100 Subject: [PATCH 2/3] fixed gcc 13 compilation + some warnings --- contrib/epee/include/gzip_encoding.h | 2 +- src/currency_core/currency_format_utils.cpp | 2 +- src/currency_core/genesis.cpp | 4 +--- src/currency_core/genesis.h | 14 +++++--------- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/contrib/epee/include/gzip_encoding.h b/contrib/epee/include/gzip_encoding.h index e2e1ea2c..6c27c5a8 100644 --- a/contrib/epee/include/gzip_encoding.h +++ b/contrib/epee/include/gzip_encoding.h @@ -182,7 +182,7 @@ namespace net_utils * */ inline - virtual void stop(std::string& OUT collect_remains) + virtual void stop(std::string& OUT collect_remains) override { } protected: diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp index 96d55b46..60024b71 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp @@ -4274,7 +4274,7 @@ namespace currency { payment_id.clear(); blobdata blob; - uint64_t prefix; + uint64_t prefix{}; if (!tools::base58::decode_addr(str, prefix, blob)) { LOG_PRINT_L1("Invalid address format: base58 decoding failed for \"" << str << "\""); diff --git a/src/currency_core/genesis.cpp b/src/currency_core/genesis.cpp index a58dcb4e..5c5435a5 100644 --- a/src/currency_core/genesis.cpp +++ b/src/currency_core/genesis.cpp @@ -1,8 +1,7 @@ -// Copyright (c) 2014-2018 Zano Project +// Copyright (c) 2014-2025 Zano Project // Copyright (c) 2014-2018 The Louisdor Project // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "genesis.h" namespace currency @@ -17,4 +16,3 @@ namespace currency {0x00,0x00}}; #endif } - diff --git a/src/currency_core/genesis.h b/src/currency_core/genesis.h index 8ea77d89..1c025c90 100644 --- a/src/currency_core/genesis.h +++ b/src/currency_core/genesis.h @@ -1,11 +1,11 @@ -// Copyright (c) 2014-2018 Zano Project -// Copyright (c) 2014-2018 Zano Project +// Copyright (c) 2014-2025 Zano Project // Copyright (c) 2014-2018 The Louisdor Project // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#pragma once +#pragma once #include +#include + namespace currency { #pragma pack(push, 1) @@ -17,7 +17,7 @@ namespace currency }; #else - struct genesis_tx_raw_data + struct genesis_tx_raw_data { uint64_t const v[42]; uint8_t const r[2]; @@ -26,7 +26,3 @@ namespace currency #pragma pack(pop) extern const genesis_tx_raw_data ggenesis_tx_raw; } - - - - From 93c6c2a0b34c1a2da86e97a8721793181b895bea Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 16 Jan 2025 05:40:28 +0100 Subject: [PATCH 3/3] more compilation fixed for gcc --- src/wallet/plain_wallet_api.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/wallet/plain_wallet_api.h b/src/wallet/plain_wallet_api.h index f12eba03..84fe46ae 100644 --- a/src/wallet/plain_wallet_api.h +++ b/src/wallet/plain_wallet_api.h @@ -1,11 +1,10 @@ -// Copyright (c) 2014-2020 Zano Project +// Copyright (c) 2014-2025 Zano Project // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - - #pragma once #include +#include #include "../common/error_codes.h" namespace plain_wallet