Add lambda support to Require (#1705)

* Add lambda support to Require * Capture by copy --------- Co-authored-by: Prasanna Loganathar <[email protected]>
DeFiCh · Feb 1, 2023 · 0e1a130 · 0e1a130
1 parent fdb5624
commit 0e1a130
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/amount.h b/src/amount.h
@@ -125,7 +125,7 @@ struct CTokenAmount { // simple std::pair is less informative
 
     Res Add(CAmount amount) {
         // safety checks
-        Require(amount >= 0, "negative amount: %s", GetDecimaleString(amount));
+        Require(amount >= 0, [=]{ return strprintf("negative amount: %s", GetDecimaleString(amount)); });
 
         // add
         auto sumRes = SafeAdd(nValue, amount);
@@ -137,8 +137,8 @@ struct CTokenAmount { // simple std::pair is less informative
 
     Res Sub(CAmount amount) {
         // safety checks
-        Require(amount >= 0, "negative amount: %s", GetDecimaleString(amount));
-        Require(nValue >= amount, "amount %s is less than %s", GetDecimaleString(nValue), GetDecimaleString(amount));
+        Require(amount >= 0, [=]{ return strprintf("negative amount: %s", GetDecimaleString(amount)); });
+        Require(nValue >= amount, [=]{ return strprintf("amount %s is less than %s", GetDecimaleString(nValue), GetDecimaleString(amount)); });
 
         // sub
         nValue -= amount;

diff --git a/src/masternodes/res.h b/src/masternodes/res.h
@@ -113,10 +113,11 @@ Res CheckRes(T &&res, std::tuple<Args...> &&args) {
     if constexpr (size == 0) {
         static_assert(std::is_convertible_v<T, Res>);
         return std::forward<T>(res);
-    } else if constexpr (std::
-                             is_invocable_r_v<std::string, std::tuple_element_t<0, std::tuple<Args...>>, std::string>) {
+    } else if constexpr (std::is_invocable_r_v<std::string, std::tuple_element_t<0, std::tuple<Args...>>, std::string>) {
         static_assert(std::is_convertible_v<T, Res>);
         return Res::Err(std::invoke(std::get<0>(args), res.msg));
+    } else if constexpr (size == 1 && std::is_invocable_r_v<std::string, std::tuple_element_t<0, std::tuple<Args...>>>) {
+        return Res::Err(std::invoke(std::get<0>(args)));
     } else {
         return Res::Err(args, std::make_index_sequence<size>{});
     }