diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f265193..0f868b5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [1.0.0.1004] - 2022-04-25 +### Changed +- Removed `set_project_uuid` and `set_project_uuid_in` member-functions from `BalanceFilter`. + ## [1.0.0.1003] - 2022-04-11 ### Changed - `GetWallets` query in project schema no longer implements `PaginationArguments`. @@ -37,7 +41,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added - Initial alpha release. -[Unreleased]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1003...HEAD +[Unreleased]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1004...HEAD +[1.0.0.1004]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1003...1.0.0.1004 [1.0.0.1003]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1002...1.0.0.1003 [1.0.0.1002]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1001...1.0.0.1002 [1.0.0.1001]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1000...1.0.0.1001 diff --git a/CMakeLists.txt b/CMakeLists.txt index fcc940a7..7d6c0377 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ include(GenerateExportHeader) ### Define project and set properties project(enjinsdk LANGUAGES CXX - VERSION 1.0.0.1003) + VERSION 1.0.0.1004) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) diff --git a/DOXYFILE b/DOXYFILE index ab460f07..7b5b47b2 100644 --- a/DOXYFILE +++ b/DOXYFILE @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Enjin C++ SDK" -PROJECT_NUMBER = 1.0.0.1003 +PROJECT_NUMBER = 1.0.0.1004 PROJECT_BRIEF = "A C++ SDK for creating games using the Enjin blockchain platform." PROJECT_LOGO = doxygenIcon.png OUTPUT_DIRECTORY = diff --git a/include/enjinsdk/models/BalanceFilter.hpp b/include/enjinsdk/models/BalanceFilter.hpp index ba8e4a1d..d5009689 100644 --- a/include/enjinsdk/models/BalanceFilter.hpp +++ b/include/enjinsdk/models/BalanceFilter.hpp @@ -45,16 +45,6 @@ class ENJINSDK_EXPORT BalanceFilter : public serialization::ISerializable { /// \return This filter for chaining. BalanceFilter& set_or(const std::vector& others); - /// \brief Sets the project UUID to filter for. - /// \param project_uuid The project UUID. - /// \return This filter for chaining. - BalanceFilter& set_project_uuid(const std::string& project_uuid); - - /// \brief Sets the project UUIDs to filter for. - /// \param project_uuids The project UUIDs. - /// \return This filter for chaining. - BalanceFilter& set_project_uuid_in(const std::vector& project_uuids); - /// \brief Sets the asset ID to filter for. /// \param asset_id The asset ID. /// \return This filter for chaining. @@ -92,8 +82,6 @@ class ENJINSDK_EXPORT BalanceFilter : public serialization::ISerializable { private: std::optional> and_filters; std::optional> or_filters; - std::optional project_uuid; - std::optional> project_uuid_in; std::optional asset_id; std::optional> asset_id_in; std::optional wallet; @@ -103,8 +91,6 @@ class ENJINSDK_EXPORT BalanceFilter : public serialization::ISerializable { constexpr static char AND_KEY[] = "and"; constexpr static char OR_KEY[] = "or"; - constexpr static char PROJECT_UUID_KEY[] = "projectUuid"; - constexpr static char PROJECT_UUID_IN_KEY[] = "projectUuid_in"; constexpr static char ASSET_ID_KEY[] = "assetId"; constexpr static char ASSET_ID_IN_KEY[] = "assetId_in"; constexpr static char WALLET_KEY[] = "wallet"; diff --git a/src/models/BalanceFilter.cpp b/src/models/BalanceFilter.cpp index 4c1d7f2c..4e74653c 100644 --- a/src/models/BalanceFilter.cpp +++ b/src/models/BalanceFilter.cpp @@ -29,12 +29,6 @@ std::string BalanceFilter::serialize() const { if (or_filters.has_value()) { utils::set_array_member_from_type_vector(document, OR_KEY, or_filters.value()); } - if (project_uuid.has_value()) { - utils::set_string_member(document, PROJECT_UUID_KEY, project_uuid.value()); - } - if (project_uuid_in.has_value()) { - utils::set_array_member_from_string_vector(document, PROJECT_UUID_IN_KEY, project_uuid_in.value()); - } if (asset_id.has_value()) { utils::set_string_member(document, ASSET_ID_KEY, asset_id.value()); } @@ -67,16 +61,6 @@ BalanceFilter& BalanceFilter::set_or(const std::vector& others) { return *this; } -BalanceFilter& BalanceFilter::set_project_uuid(const std::string& project_uuid) { - BalanceFilter::project_uuid = project_uuid; - return *this; -} - -BalanceFilter& BalanceFilter::set_project_uuid_in(const std::vector& project_uuids) { - project_uuid_in = project_uuids; - return *this; -} - BalanceFilter& BalanceFilter::set_asset_id(const std::string& asset_id) { BalanceFilter::asset_id = asset_id; return *this; diff --git a/test/unit/models/BalanceFilterTest.cpp b/test/unit/models/BalanceFilterTest.cpp index cedbf945..3c5a964f 100644 --- a/test/unit/models/BalanceFilterTest.cpp +++ b/test/unit/models/BalanceFilterTest.cpp @@ -28,13 +28,11 @@ class BalanceFilterTest : public JsonTestSuite, BalanceFilter class_under_test; constexpr static char POPULATED_JSON_OBJECT[] = - R"({"and":[],"or":[],"projectUuid":"1","projectUuid_in":[],"assetId":"1","assetId_in":[],"wallet":"1","wallet_in":[],"value":1,"value_is":"GREATER_THAN"})"; + R"({"and":[],"or":[],"assetId":"1","assetId_in":[],"wallet":"1","wallet_in":[],"value":1,"value_is":"GREATER_THAN"})"; static BalanceFilter create_default_filter() { return BalanceFilter().set_and(std::vector()) .set_or(std::vector()) - .set_project_uuid("1") - .set_project_uuid_in(std::vector()) .set_asset_id("1") .set_asset_id_in(std::vector()) .set_wallet("1") @@ -60,8 +58,6 @@ TEST_F(BalanceFilterTest, SerializeSetFieldsReturnsExpectedJsonObject) { const std::string expected(POPULATED_JSON_OBJECT); class_under_test.set_and(std::vector()) .set_or(std::vector()) - .set_project_uuid("1") - .set_project_uuid_in(std::vector()) .set_asset_id("1") .set_asset_id_in(std::vector()) .set_wallet("1")