From 7a45c33d1f8a758850cf8e7bd6ad508939ba5c0d Mon Sep 17 00:00:00 2001 From: furszy Date: Fri, 8 Apr 2022 16:24:46 -0300 Subject: Introduce generic 'Result' class Useful to encapsulate the function result object (in case of having it) or, in case of failure, the failure reason. This let us clean lot of boilerplate code, as now instead of returning a boolean and having to add a ref arg for the return object and another ref for the error string. We can simply return a 'BResult'. Example of what we currently have: ``` bool doSomething(arg1, arg2, arg3, arg4, &result, &error_string) { do something... if (error) { error_string = "something bad happened"; return false; } result = goodResult; return true; } ``` Example of what we will get with this commit: ``` BResult doSomething(arg1, arg2, arg3, arg4) { do something... if (error) return {"something happened"}; // good return {goodResult}; } ``` This allows a similar boilerplate cleanup on the function callers side as well. They don't have to add the extra pre-function-call error string and result object declarations to pass the references to the function. --- src/Makefile.am | 1 + src/util/result.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 src/util/result.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 3fbbe180fc..a9e9db0a7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -277,6 +277,7 @@ BITCOIN_CORE_H = \ util/overloaded.h \ util/rbf.h \ util/readwritefile.h \ + util/result.h \ util/serfloat.h \ util/settings.h \ util/sock.h \ diff --git a/src/util/result.h b/src/util/result.h new file mode 100644 index 0000000000..dcf5edaa5b --- /dev/null +++ b/src/util/result.h @@ -0,0 +1,43 @@ +// Copyright (c) 2022 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or https://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_UTIL_RESULT_H +#define BITCOIN_UTIL_RESULT_H + +#include +#include + +/* + * 'BResult' is a generic class useful for wrapping a return object + * (in case of success) or propagating the error cause. +*/ +template +class BResult { +private: + std::variant m_variant; + +public: + BResult() : m_variant(Untranslated("")) {} + BResult(const T& _obj) : m_variant(_obj) {} + BResult(const bilingual_str& error) : m_variant(error) {} + + /* Whether the function succeeded or not */ + bool HasRes() const { return std::holds_alternative(m_variant); } + + /* In case of success, the result object */ + const T& GetObj() const { + assert(HasRes()); + return std::get(m_variant); + } + + /* In case of failure, the error cause */ + const bilingual_str& GetError() const { + assert(!HasRes()); + return std::get(m_variant); + } + + explicit operator bool() const { return HasRes(); } +}; + +#endif // BITCOIN_UTIL_RESULT_H -- cgit v1.2.3