diff --git a/include/xrpl/protocol/SeqProxy.h b/include/xrpl/protocol/SeqProxy.h index 24de379a38..1a7faa49d9 100644 --- a/include/xrpl/protocol/SeqProxy.h +++ b/include/xrpl/protocol/SeqProxy.h @@ -156,24 +156,5 @@ public: os << seqProx.value(); return os; } - - constexpr SeqProxy - operator+(std::uint32_t const& rhs) const - { - return SeqProxy{type_, value_ + rhs}; - } - - friend constexpr SeqProxy - operator+(std::uint32_t const& lhs, SeqProxy const& rhs) - { - return rhs + lhs; - } - - constexpr SeqProxy& - operator+=(std::uint32_t const& rhs) - { - value_ += rhs; - return *this; - } }; } // namespace xrpl diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp index 17d7617590..3079f1f359 100644 --- a/src/libxrpl/protocol/STTx.cpp +++ b/src/libxrpl/protocol/STTx.cpp @@ -209,7 +209,7 @@ STTx::getSeqProxy() const return SeqProxy::sequence(seq); } - return SeqProxy{SeqProxy::Type::Ticket, *ticketSeq}; + return SeqProxy::ticket(*ticketSeq); } std::uint32_t diff --git a/src/libxrpl/tx/transactors/system/TicketCreate.cpp b/src/libxrpl/tx/transactors/system/TicketCreate.cpp index c095cf5269..f0f461cf67 100644 --- a/src/libxrpl/tx/transactors/system/TicketCreate.cpp +++ b/src/libxrpl/tx/transactors/system/TicketCreate.cpp @@ -99,8 +99,7 @@ TicketCreate::doApply() for (std::uint32_t i = 0; i < ticketCount; ++i) { std::uint32_t const curTicketSeq = firstTicketSeq + i; - Keylet const ticketKeylet = - keylet::ticket(accountID_, SeqProxy{SeqProxy::Type::Ticket, curTicketSeq}); + Keylet const ticketKeylet = keylet::ticket(accountID_, SeqProxy::ticket(curTicketSeq)); SLE::pointer const sleTicket = std::make_shared(ticketKeylet); sleTicket->setAccountID(sfAccount, accountID_); diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h index 4df2caecef..430bc815d9 100644 --- a/src/test/jtx/TestHelpers.h +++ b/src/test/jtx/TestHelpers.h @@ -780,7 +780,7 @@ inline constexpr FeeLevel64 kBaseFeeLevel{TxQ::kBaseLevel}; inline constexpr FeeLevel64 kMinEscalationFeeLevel = kBaseFeeLevel * 500; inline uint256 -getCheckIndex(AccountID const& account, uint32_t const& sequence) +getCheckIndex(AccountID const& account, std::uint32_t const sequence) { return keylet::check(account, SeqProxy::sequence(sequence)).key; }