Add basic REST tests and fix a few bugs (#103)

vtnerd · Apr 6, 2024 · 4c22059 · 4c22059
1 parent de7268f
commit 4c22059
Show file tree

Hide file tree

Showing 7 changed files with 633 additions and 66 deletions.
diff --git a/src/rest_server.cpp b/src/rest_server.cpp
@@ -544,7 +544,7 @@ namespace lws
           MONERO_CHECK((*tclient)->send(std::move(msg), std::chrono::seconds{10}));
         }
 
-        if ((req.use_dust && req.use_dust) || !req.dust_threshold)
+        if ((req.use_dust && *req.use_dust) || !req.dust_threshold)
           req.dust_threshold = rpc::safe_uint64(0);
 
         if (!req.mixin)

diff --git a/src/rpc/light_wallet.cpp b/src/rpc/light_wallet.cpp
@@ -262,6 +262,7 @@ namespace lws
         wire::field("coinbase", is_coinbase),
         wire::field("mempool", false),
         wire::field("mixin", self.value().info.spend_meta.mixin_count),
+        wire::field("recipient", self.value().info.recipient),
         wire::field("spent_outputs", std::cref(self.value().spends))
       );
     }
@@ -316,7 +317,7 @@ namespace lws
       WIRE_FIELD_COPY(per_byte_fee),
       WIRE_FIELD_COPY(fee_mask),
       WIRE_FIELD_COPY(amount),
-      wire::field("outputs", wire::array(boost::adaptors::transform(self.outputs, expand)))
+      wire::optional_field("outputs", wire::array(boost::adaptors::transform(self.outputs, expand)))
     );
   }
 

diff --git a/src/wire/field.h b/src/wire/field.h
@@ -110,7 +110,7 @@ namespace wire
     static constexpr bool optional_on_empty() noexcept
     { return is_optional_on_empty<value_type>::value; }
 
-    static constexpr bool is_required() noexcept { return Required; }
+    static constexpr bool is_required() noexcept { return Required && !optional_on_empty(); }
     static constexpr std::size_t count() noexcept { return 1; }
     static constexpr unsigned id() noexcept { return I; }
 

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -34,7 +34,7 @@ add_subdirectory(db)
 add_subdirectory(rpc)
 add_subdirectory(wire)
 
-add_executable(monero-lws-unit main.cpp scanner.test.cpp)
+add_executable(monero-lws-unit main.cpp rest.test.cpp scanner.test.cpp)
 target_link_libraries(monero-lws-unit
   monero::libraries
   monero-lws-daemon-common