Skip to content

Commit

Permalink
Merge pull request #41 from k-nuth/feat/code-modernization
Browse files Browse the repository at this point in the history
feat: code modernization in domain
  • Loading branch information
fpelliccioni authored Nov 21, 2024
2 parents bc4027a + d289256 commit b683a55
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 32 deletions.
7 changes: 5 additions & 2 deletions include/kth/domain/chain/input_basis.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ class KD_API input_basis {
// Operators.
//-------------------------------------------------------------------------

bool operator==(input_basis const& x) const;
bool operator!=(input_basis const& x) const;
friend
bool operator==(input_basis const&, input_basis const&) = default;

friend
bool operator!=(input_basis const&, input_basis const&) = default;

// Deserialization.
//-------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions include/kth/domain/chain/output.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ class KD_API output : public output_basis {
output& operator=(output const& x);
output& operator=(output&& x) noexcept;

// Operators.
//-------------------------------------------------------------------------
// bool operator==(output const& x) const;
// bool operator!=(output const& x) const;

// Deserialization.
//-------------------------------------------------------------------------

Expand Down
7 changes: 4 additions & 3 deletions include/kth/domain/chain/output_basis.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ struct KD_API output_basis {

// Operators.
//-------------------------------------------------------------------------
// bool operator==(output_basis const& x) const;
// bool operator!=(output_basis const& x) const;
friend
auto operator<=>(output_basis const&, output_basis const&) = default;
bool operator==(output_basis const&, output_basis const&) = default;

friend
bool operator!=(output_basis const&, output_basis const&) = default;

// Deserialization.
//-------------------------------------------------------------------------
Expand Down
18 changes: 14 additions & 4 deletions include/kth/domain/chain/token_data.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,23 @@ enum class capability_t : uint8_t {
struct fungible {
amount_t amount;


friend constexpr
bool operator==(fungible const&, fungible const&) = default;

friend constexpr
auto operator<=>(fungible const&, fungible const&) = default;
bool operator!=(fungible const&, fungible const&) = default;
};

struct non_fungible {
capability_t capability;
commitment_t commitment;

friend
auto operator<=>(non_fungible const&, non_fungible const&) = default;
friend constexpr
bool operator==(non_fungible const&, non_fungible const&) = default;

friend constexpr
bool operator!=(non_fungible const&, non_fungible const&) = default;
};

using both_kinds = std::pair<fungible, non_fungible>;
Expand All @@ -124,7 +131,10 @@ struct token_data_t {
std::variant<fungible, non_fungible, both_kinds> data;

friend constexpr
auto operator<=>(token_data_t const&, token_data_t const&) = default;
bool operator==(token_data_t const&, token_data_t const&) = default;

friend constexpr
bool operator!=(token_data_t const&, token_data_t const&) = default;
};

using token_data_opt = std::optional<token_data_t>;
Expand Down
18 changes: 0 additions & 18 deletions src/chain/input_basis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,6 @@ input_basis::input_basis(output_point&& previous_output, chain::script&& script,
{}
#endif


// Operators.
//-----------------------------------------------------------------------------

bool input_basis::operator==(input_basis const& x) const {
return (sequence_ == x.sequence_)
&& (previous_output_ == x.previous_output_)
&& (script_ == x.script_)
#if defined(KTH_SEGWIT_ENABLED)
&& (witness_ == x.witness_)
#endif
;
}

bool input_basis::operator!=(input_basis const& x) const {
return !(*this == x);
}

void input_basis::reset() {
previous_output_.reset();
script_.reset();
Expand Down

0 comments on commit b683a55

Please sign in to comment.