From 16e9db237613de071f6b3b435ccdc655cbb90ee4 Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Fri, 15 Oct 2021 19:37:58 -0700 Subject: [PATCH] Add test for msg to sent payment (#1606) * Add test for msg to sent payment * Remove redundant assertion about sent payment secret key --- squeaknode/admin/messages.py | 6 ++++-- tests/admin/test_messages.py | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/squeaknode/admin/messages.py b/squeaknode/admin/messages.py index b00425fb..f35a9fd6 100644 --- a/squeaknode/admin/messages.py +++ b/squeaknode/admin/messages.py @@ -230,9 +230,11 @@ def message_to_squeak_entry(squeak_entry_msg: squeak_admin_pb2.SqueakDisplayEntr def message_to_sent_payment(sent_payment: squeak_admin_pb2.SentPayment) -> SentPayment: + sent_payment_id = sent_payment.sent_payment_id if sent_payment.sent_payment_id > 0 else None + created_time_ms = sent_payment.time_ms if sent_payment.time_ms > 0 else None return SentPayment( - sent_payment_id=sent_payment.sent_payment_id, - created_time_ms=sent_payment.time_ms, + sent_payment_id=sent_payment_id, + created_time_ms=created_time_ms, peer_address=message_to_peer_address(sent_payment.peer_address), squeak_hash=bytes.fromhex(sent_payment.squeak_hash), payment_hash=bytes.fromhex(sent_payment.payment_hash), diff --git a/tests/admin/test_messages.py b/tests/admin/test_messages.py index b49b5a62..1e183b4b 100644 --- a/tests/admin/test_messages.py +++ b/tests/admin/test_messages.py @@ -20,6 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. from squeaknode.admin.messages import message_to_peer_address +from squeaknode.admin.messages import message_to_sent_payment from squeaknode.admin.messages import message_to_squeak_entry from squeaknode.admin.messages import peer_address_to_message from squeaknode.admin.messages import received_offer_to_message @@ -94,6 +95,14 @@ def test_sent_payment_to_message(sent_payment, sent_payment_msg): assert msg == sent_payment_msg +def test_message_to_sent_payment(sent_payment, sent_payment_msg): + decoded_sent_payment = message_to_sent_payment(sent_payment_msg) + + # TODO: remove this line after including secret key in sent payment msg. + sent_payment_with_empty_secret_key = sent_payment._replace(secret_key=b'') + assert decoded_sent_payment == sent_payment_with_empty_secret_key + + def test_squeak_detail_to_message(squeak, squeak_detail_msg): msg = squeak_to_detail_message(squeak)