From 47549ce89937d0ad446f1298c0082cbe5e59b49d Mon Sep 17 00:00:00 2001 From: Yosuke Otosu Date: Tue, 20 Aug 2024 11:36:26 +0900 Subject: [PATCH] Store the settlement_service_type of dvp delivery when indexing --- app/model/db/idx_dvp_delivery.py | 5 + app/model/schema/settlement.py | 14 +- app/routers/issuer/settlement_issuer.py | 6 +- app/routers/misc/settlement_agent.py | 4 +- batch/indexer_dvp_delivery.py | 15 +- ...agent_{exchange_address}_deliveries_GET.py | 931 +++++++++++-- ...t_dvp_{exchange_address}_deliveries_GET.py | 1171 +++++++++++++++-- ...nge_address}_delivery_{delivery_id}_GET.py | 25 +- tests/batch/test_indexer_dvp_delivery.py | 10 + 9 files changed, 1965 insertions(+), 216 deletions(-) diff --git a/app/model/db/idx_dvp_delivery.py b/app/model/db/idx_dvp_delivery.py index 8cec4553..a1e78c16 100644 --- a/app/model/db/idx_dvp_delivery.py +++ b/app/model/db/idx_dvp_delivery.py @@ -61,6 +61,10 @@ class IDXDelivery(Base): agent_address: Mapped[str] = mapped_column(String(42), index=True, nullable=False) # Data data: Mapped[str] = mapped_column(Text) + # Settlement Service Type + settlement_service_type: Mapped[str | None] = mapped_column( + String(50), nullable=True + ) # Create Delivery Blocktimestamp create_blocktimestamp: Mapped[datetime] = mapped_column(DateTime, nullable=False) # Create Transaction Hash @@ -102,6 +106,7 @@ def json(self): "agent_address": self.agent_address, "amount": self.amount, "data": self.data, + "settlement_service_type": self.settlement_service_type, "create_blocktimestamp": self.create_blocktimestamp, "create_transaction_hash": self.create_transaction_hash, "cancel_blocktimestamp": self.cancel_blocktimestamp, diff --git a/app/model/schema/settlement.py b/app/model/schema/settlement.py index 048ac5ae..a989e589 100644 --- a/app/model/schema/settlement.py +++ b/app/model/schema/settlement.py @@ -46,6 +46,14 @@ class DeliveryStatus(IntEnum): DELIVERY_ABORTED = 4 +class DVPDeliveryData(BaseModel): + delivery_type: Literal["offering", "primary"] + trade_date: str + settlement_date: str + settlement_service_account_id: str + value: int + + ############################ # REQUEST ############################ @@ -192,7 +200,8 @@ class RetrieveDVPDeliveryResponse(BaseModel): seller_personal_information: Optional[PersonalInfo] = Field(...) amount: int agent_address: str - data: str = Field(examples=["{}", '{"type": "primary"}']) + data: DVPDeliveryData | None + settlement_service_type: str | None create_blocktimestamp: str create_transaction_hash: str cancel_blocktimestamp: Optional[str] = Field(...) @@ -225,7 +234,8 @@ class RetrieveDVPAgentDeliveryResponse(BaseModel): seller_address: str amount: int agent_address: str - data: str = Field(examples=["{}", '{"type": "primary"}']) + data: DVPDeliveryData | None + settlement_service_type: str | None create_blocktimestamp: str create_transaction_hash: str cancel_blocktimestamp: Optional[str] = Field(...) diff --git a/app/routers/issuer/settlement_issuer.py b/app/routers/issuer/settlement_issuer.py index e642ea05..96bed084 100644 --- a/app/routers/issuer/settlement_issuer.py +++ b/app/routers/issuer/settlement_issuer.py @@ -214,7 +214,8 @@ async def list_all_dvp_deliveries( ), "amount": _delivery.amount, "agent_address": _delivery.agent_address, - "data": _delivery.data, + "data": json.loads(_delivery.data) if _delivery.data else None, + "settlement_service_type": _delivery.settlement_service_type, "create_blocktimestamp": create_blocktimestamp, "create_transaction_hash": _delivery.create_transaction_hash, "cancel_blocktimestamp": cancel_blocktimestamp, @@ -479,7 +480,8 @@ async def retrieve_dvp_delivery( ), "amount": _delivery[0].amount, "agent_address": _delivery[0].agent_address, - "data": _delivery[0].data, + "data": json.loads(_delivery[0].data) if _delivery[0].data else None, + "settlement_service_type": _delivery[0].settlement_service_type, "create_blocktimestamp": create_blocktimestamp, "create_transaction_hash": _delivery[0].create_transaction_hash, "cancel_blocktimestamp": cancel_blocktimestamp, diff --git a/app/routers/misc/settlement_agent.py b/app/routers/misc/settlement_agent.py index 701576b7..e38bc4c7 100644 --- a/app/routers/misc/settlement_agent.py +++ b/app/routers/misc/settlement_agent.py @@ -17,6 +17,7 @@ SPDX-License-Identifier: Apache-2.0 """ +import json import re import secrets from datetime import UTC @@ -357,7 +358,8 @@ async def list_all_dvp_agent_deliveries( "seller_address": _delivery.seller_address, "amount": _delivery.amount, "agent_address": _delivery.agent_address, - "data": _delivery.data, + "data": json.loads(_delivery.data) if _delivery.data else None, + "settlement_service_type": _delivery.settlement_service_type, "create_blocktimestamp": create_blocktimestamp, "create_transaction_hash": _delivery.create_transaction_hash, "cancel_blocktimestamp": cancel_blocktimestamp, diff --git a/batch/indexer_dvp_delivery.py b/batch/indexer_dvp_delivery.py index 92dc380b..38abcd50 100644 --- a/batch/indexer_dvp_delivery.py +++ b/batch/indexer_dvp_delivery.py @@ -312,7 +312,7 @@ async def __sync_delivery_created( # "settlement_service_type": "", # "data": "" # } - raw_data = args.get("data") + raw_data: str = args.get("data") try: raw_data_json = json.loads(raw_data) except JSONDecodeError: @@ -323,7 +323,7 @@ async def __sync_delivery_created( "data": None, } - _data = raw_data + _data: str = raw_data if DVP_DATA_ENCRYPTION_MODE == "aes-256-cbc": if ( raw_data_json.get("encryption_algorithm") == "aes-256-cbc" @@ -360,6 +360,9 @@ async def __sync_delivery_created( block_timestamp=block_timestamp, transaction_hash=transaction_hash, data=_data, + settlement_service_type=raw_data_json.get( + "settlement_service_type", None + ), ) except Exception: raise @@ -591,19 +594,22 @@ async def __sink_on_delivery( block_timestamp: int, transaction_hash: str, data: Optional[str] = None, + settlement_service_type: Optional[str] = None, ): """Update Delivery data in DB :param db_session: ORM session :param event_type: event type ["Created", "Canceled", "Confirmed", "Finished", "Aborted"] - :param token_address: token address :param exchange_address: exchange address :param delivery_id: delivery id + :param token_address: token address :param buyer_address: delivery buyer address :param seller_address: delivery seller address :param amount: delivery amount :param agent_address: delivery agent address - :param data: optional data (Created) :param block_timestamp: block timestamp + :param transaction_hash: transaction hash + :param data: [optional] data (Created) + :param settlement_service_type: [optional] settlement service type (Created) :return: None """ # Verify account exists @@ -662,6 +668,7 @@ async def __sink_on_delivery( delivery.amount = amount delivery.agent_address = agent_address delivery.data = data + delivery.settlement_service_type = settlement_service_type delivery.create_blocktimestamp = datetime.fromtimestamp( block_timestamp, tz=UTC ) diff --git a/tests/app/test_settlement_dvp_agent_{exchange_address}_deliveries_GET.py b/tests/app/test_settlement_dvp_agent_{exchange_address}_deliveries_GET.py index e5f6b22d..9ecbcc28 100644 --- a/tests/app/test_settlement_dvp_agent_{exchange_address}_deliveries_GET.py +++ b/tests/app/test_settlement_dvp_agent_{exchange_address}_deliveries_GET.py @@ -17,6 +17,7 @@ SPDX-License-Identifier: Apache-2.0 """ +import json from datetime import UTC, datetime from app.model.db import DeliveryStatus, IDXDelivery, Token, TokenType, TokenVersion @@ -98,7 +99,16 @@ def test_normal_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -115,7 +125,16 @@ def test_normal_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -134,7 +153,16 @@ def test_normal_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -153,7 +181,16 @@ def test_normal_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -174,7 +211,16 @@ def test_normal_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -197,7 +243,16 @@ def test_normal_2(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_2 # other agent - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -225,7 +280,14 @@ def test_normal_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -248,7 +310,14 @@ def test_normal_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -271,7 +340,14 @@ def test_normal_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -294,7 +370,14 @@ def test_normal_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -317,7 +400,14 @@ def test_normal_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -377,7 +467,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -394,7 +493,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -413,7 +521,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -432,7 +549,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -453,7 +579,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -476,7 +611,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -507,7 +651,14 @@ def test_normal_3_1(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -530,7 +681,14 @@ def test_normal_3_1(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -553,7 +711,14 @@ def test_normal_3_1(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -576,7 +741,14 @@ def test_normal_3_1(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -599,7 +771,14 @@ def test_normal_3_1(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -659,7 +838,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -676,7 +864,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -695,7 +892,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -714,7 +920,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -735,7 +950,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -758,7 +982,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -789,7 +1022,14 @@ def test_normal_3_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -812,7 +1052,14 @@ def test_normal_3_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -835,7 +1082,14 @@ def test_normal_3_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -858,7 +1112,14 @@ def test_normal_3_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -881,7 +1142,14 @@ def test_normal_3_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -941,7 +1209,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -958,7 +1235,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -977,7 +1263,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -996,7 +1291,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1017,7 +1321,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1040,7 +1353,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1068,7 +1390,14 @@ def test_normal_3_3(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -1091,7 +1420,14 @@ def test_normal_3_3(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1151,7 +1487,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1168,7 +1513,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -1187,7 +1541,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1206,7 +1569,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1227,7 +1599,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1250,7 +1631,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1281,7 +1671,14 @@ def test_normal_3_4(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1341,7 +1738,16 @@ def test_normal_3_5_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1358,7 +1764,16 @@ def test_normal_3_5_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -1377,7 +1792,16 @@ def test_normal_3_5_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1396,7 +1820,16 @@ def test_normal_3_5_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1417,7 +1850,16 @@ def test_normal_3_5_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1440,7 +1882,16 @@ def test_normal_3_5_1(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1471,7 +1922,14 @@ def test_normal_3_5_1(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:01+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1531,7 +1989,16 @@ def test_normal_3_5_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1548,7 +2015,16 @@ def test_normal_3_5_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -1567,7 +2043,16 @@ def test_normal_3_5_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1586,7 +2071,16 @@ def test_normal_3_5_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) @@ -1607,7 +2101,16 @@ def test_normal_3_5_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) @@ -1630,7 +2133,16 @@ def test_normal_3_5_2(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 5) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1661,7 +2173,14 @@ def test_normal_3_5_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:01+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -1684,7 +2203,14 @@ def test_normal_3_5_2(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1744,7 +2270,16 @@ def test_normal_3_5_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1761,7 +2296,16 @@ def test_normal_3_5_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -1780,7 +2324,16 @@ def test_normal_3_5_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1799,7 +2352,16 @@ def test_normal_3_5_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) @@ -1820,7 +2382,16 @@ def test_normal_3_5_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) @@ -1843,7 +2414,16 @@ def test_normal_3_5_3(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 5) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1875,7 +2455,14 @@ def test_normal_3_5_3(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:01+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -1935,7 +2522,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1952,7 +2548,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -1971,7 +2576,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1990,7 +2604,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) @@ -2011,7 +2634,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) @@ -2034,7 +2666,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2062,7 +2703,14 @@ def test_normal_4(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2085,7 +2733,14 @@ def test_normal_4(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:01+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -2108,7 +2763,14 @@ def test_normal_4(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:02+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2131,7 +2793,14 @@ def test_normal_4(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:03+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2154,7 +2823,14 @@ def test_normal_4(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:04+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2177,7 +2853,14 @@ def test_normal_4(self, client, db): "seller_address": seller_address_2, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2024-01-01T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2237,7 +2920,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2254,7 +2946,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -2273,7 +2974,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2292,7 +3002,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2313,7 +3032,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2336,7 +3064,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = self.agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2364,7 +3101,14 @@ def test_normal_5(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -2387,7 +3131,14 @@ def test_normal_5(self, client, db): "seller_address": seller_address_1, "amount": 1, "agent_address": self.agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, diff --git a/tests/app/test_settlement_dvp_{exchange_address}_deliveries_GET.py b/tests/app/test_settlement_dvp_{exchange_address}_deliveries_GET.py index 04f5c117..e92c548c 100644 --- a/tests/app/test_settlement_dvp_{exchange_address}_deliveries_GET.py +++ b/tests/app/test_settlement_dvp_{exchange_address}_deliveries_GET.py @@ -17,6 +17,7 @@ SPDX-License-Identifier: Apache-2.0 """ +import json from datetime import UTC, datetime from app.model.db import ( @@ -108,7 +109,16 @@ def test_normal_2_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -125,7 +135,16 @@ def test_normal_2_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -144,7 +163,16 @@ def test_normal_2_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -163,7 +191,16 @@ def test_normal_2_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -184,7 +221,16 @@ def test_normal_2_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -207,7 +253,16 @@ def test_normal_2_1(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -239,7 +294,14 @@ def test_normal_2_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -264,7 +326,14 @@ def test_normal_2_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -289,7 +358,14 @@ def test_normal_2_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -314,7 +390,14 @@ def test_normal_2_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -339,7 +422,14 @@ def test_normal_2_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -364,7 +454,14 @@ def test_normal_2_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_2, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -473,7 +570,16 @@ def test_normal_2_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -490,7 +596,16 @@ def test_normal_2_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -509,7 +624,16 @@ def test_normal_2_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -528,7 +652,16 @@ def test_normal_2_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -549,7 +682,16 @@ def test_normal_2_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -572,7 +714,16 @@ def test_normal_2_2(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -622,7 +773,14 @@ def test_normal_2_2(self, client, db): }, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -665,7 +823,14 @@ def test_normal_2_2(self, client, db): }, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -708,7 +873,14 @@ def test_normal_2_2(self, client, db): }, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -751,7 +923,14 @@ def test_normal_2_2(self, client, db): }, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -794,7 +973,14 @@ def test_normal_2_2(self, client, db): }, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -828,7 +1014,14 @@ def test_normal_2_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_2, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -891,7 +1084,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -908,7 +1110,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -927,7 +1138,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -946,7 +1166,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -967,7 +1196,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -990,7 +1228,16 @@ def test_normal_3_1(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1023,7 +1270,14 @@ def test_normal_3_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1048,7 +1302,14 @@ def test_normal_3_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -1073,7 +1334,14 @@ def test_normal_3_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1098,7 +1366,14 @@ def test_normal_3_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1123,7 +1398,14 @@ def test_normal_3_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1186,7 +1468,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1203,7 +1494,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -1222,7 +1522,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1241,7 +1550,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1262,7 +1580,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1285,7 +1612,16 @@ def test_normal_3_2(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1318,7 +1654,14 @@ def test_normal_3_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1343,7 +1686,14 @@ def test_normal_3_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -1368,7 +1718,14 @@ def test_normal_3_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1393,7 +1750,14 @@ def test_normal_3_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1418,7 +1782,14 @@ def test_normal_3_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1481,7 +1852,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1498,7 +1878,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -1517,7 +1906,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1536,7 +1934,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1557,7 +1964,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1580,7 +1996,16 @@ def test_normal_3_3(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1613,7 +2038,14 @@ def test_normal_3_3(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1638,7 +2070,14 @@ def test_normal_3_3(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -1663,7 +2102,14 @@ def test_normal_3_3(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1688,7 +2134,14 @@ def test_normal_3_3(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1713,7 +2166,14 @@ def test_normal_3_3(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1776,7 +2236,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1793,7 +2262,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -1812,7 +2290,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1831,7 +2318,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1852,7 +2348,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -1875,7 +2380,16 @@ def test_normal_3_4(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -1908,7 +2422,14 @@ def test_normal_3_4(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -1933,7 +2454,14 @@ def test_normal_3_4(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -1996,7 +2524,16 @@ def test_normal_3_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2013,7 +2550,16 @@ def test_normal_3_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -2032,7 +2578,16 @@ def test_normal_3_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2051,7 +2606,16 @@ def test_normal_3_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2072,7 +2636,16 @@ def test_normal_3_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2095,7 +2668,16 @@ def test_normal_3_5(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2128,7 +2710,14 @@ def test_normal_3_5(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2191,7 +2780,16 @@ def test_normal_3_6_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2208,7 +2806,16 @@ def test_normal_3_6_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -2227,7 +2834,16 @@ def test_normal_3_6_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2246,7 +2862,16 @@ def test_normal_3_6_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2267,7 +2892,16 @@ def test_normal_3_6_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2290,7 +2924,16 @@ def test_normal_3_6_1(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2323,7 +2966,14 @@ def test_normal_3_6_1(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:01+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2386,7 +3036,16 @@ def test_normal_3_6_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2403,7 +3062,16 @@ def test_normal_3_6_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -2422,7 +3090,16 @@ def test_normal_3_6_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2441,7 +3118,16 @@ def test_normal_3_6_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) @@ -2462,7 +3148,16 @@ def test_normal_3_6_2(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) @@ -2485,7 +3180,16 @@ def test_normal_3_6_2(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 5) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2518,7 +3222,14 @@ def test_normal_3_6_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:01+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -2543,7 +3254,14 @@ def test_normal_3_6_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2606,7 +3324,16 @@ def test_normal_3_6_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2623,7 +3350,16 @@ def test_normal_3_6_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -2642,7 +3378,16 @@ def test_normal_3_6_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2661,7 +3406,16 @@ def test_normal_3_6_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) @@ -2682,7 +3436,16 @@ def test_normal_3_6_3(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) @@ -2705,7 +3468,16 @@ def test_normal_3_6_3(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 5) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2741,7 +3513,14 @@ def test_normal_3_6_3(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:01+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -2804,7 +3583,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2821,7 +3609,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -2840,7 +3637,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -2859,7 +3665,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 3, tzinfo=UTC) @@ -2880,7 +3695,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 4, tzinfo=UTC) @@ -2903,7 +3727,16 @@ def test_normal_4(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -2936,7 +3769,14 @@ def test_normal_4(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -2961,7 +3801,14 @@ def test_normal_4(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:01+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -2986,7 +3833,14 @@ def test_normal_4(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:02+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -3011,7 +3865,14 @@ def test_normal_4(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:03+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -3036,7 +3897,14 @@ def test_normal_4(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:04+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -3061,7 +3929,14 @@ def test_normal_4(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_2, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2024-01-01T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -3124,7 +3999,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -3141,7 +4025,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.cancel_blocktimestamp = datetime(2024, 1, 1, 0, 0, 1, tzinfo=UTC) @@ -3160,7 +4053,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -3179,7 +4081,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -3200,7 +4111,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirm_blocktimestamp = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC) @@ -3223,7 +4143,16 @@ def test_normal_5(self, client, db): _idx_delivery.seller_address = seller_address_2 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_2 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 2, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -3256,7 +4185,14 @@ def test_normal_5(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": "2023-12-31T15:00:01+00:00", @@ -3281,7 +4217,14 @@ def test_normal_5(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, diff --git a/tests/app/test_settlement_dvp_{exchange_address}_delivery_{delivery_id}_GET.py b/tests/app/test_settlement_dvp_{exchange_address}_delivery_{delivery_id}_GET.py index 562abbcc..b1be2801 100644 --- a/tests/app/test_settlement_dvp_{exchange_address}_delivery_{delivery_id}_GET.py +++ b/tests/app/test_settlement_dvp_{exchange_address}_delivery_{delivery_id}_GET.py @@ -17,6 +17,7 @@ SPDX-License-Identifier: Apache-2.0 """ +import json from datetime import UTC, datetime from app.model.db import ( @@ -106,7 +107,16 @@ def test_normal_1_1(self, client, db): _idx_delivery.seller_address = seller_address_1 _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 - _idx_delivery.data = "" + _idx_delivery.data = json.dumps( + { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + } + ) + _idx_delivery.settlement_service_type = "test_service_type" _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -154,7 +164,14 @@ def test_normal_1_1(self, client, db): }, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": { + "delivery_type": "offering", + "trade_date": "20240820", + "settlement_date": "20240820", + "settlement_service_account_id": "test_account", + "value": 1, + }, + "settlement_service_type": "test_service_type", "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, @@ -234,6 +251,7 @@ def test_normal_1_2(self, client, db): _idx_delivery.amount = 1 _idx_delivery.agent_address = agent_address_1 _idx_delivery.data = "" + _idx_delivery.settlement_service_type = None _idx_delivery.create_blocktimestamp = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC) _idx_delivery.create_transaction_hash = "tx_hash_1" _idx_delivery.confirmed = False @@ -263,7 +281,8 @@ def test_normal_1_2(self, client, db): "seller_personal_information": None, "amount": 1, "agent_address": agent_address_1, - "data": "", + "data": None, + "settlement_service_type": None, "create_blocktimestamp": "2023-12-31T15:00:00+00:00", "create_transaction_hash": "tx_hash_1", "cancel_blocktimestamp": None, diff --git a/tests/batch/test_indexer_dvp_delivery.py b/tests/batch/test_indexer_dvp_delivery.py index ac63f6f6..73a25a66 100644 --- a/tests/batch/test_indexer_dvp_delivery.py +++ b/tests/batch/test_indexer_dvp_delivery.py @@ -473,6 +473,7 @@ async def test_normal_2_1_1( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "." * 1000 + assert _delivery.settlement_service_type is None block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -638,6 +639,7 @@ async def test_normal_2_1_2( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "test_message" + assert _delivery.settlement_service_type == "test_service" block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -821,6 +823,7 @@ async def test_normal_2_1_3( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "test_message" + assert _delivery.settlement_service_type == "test_service" block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -982,6 +985,7 @@ async def test_normal_2_2_1( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "." * 1000 + assert _delivery.settlement_service_type is None block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -1171,6 +1175,7 @@ async def test_normal_2_2_2( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "." * 1000 + assert _delivery.settlement_service_type is None block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -1361,6 +1366,7 @@ async def test_normal_2_3( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "." * 1000 + assert _delivery.settlement_service_type is None block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -1563,6 +1569,7 @@ async def test_normal_2_4_1( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "." * 1000 + assert _delivery.settlement_service_type is None block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -1791,6 +1798,7 @@ async def test_normal_2_4_2( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "." * 1000 + assert _delivery.settlement_service_type is None block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -2032,6 +2040,7 @@ async def test_normal_2_5( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "." * 1000 + assert _delivery.settlement_service_type is None block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC @@ -2246,6 +2255,7 @@ async def test_normal_3( assert _delivery.amount == 30 assert _delivery.agent_address == agent_address assert _delivery.data == "." * 1000 + assert _delivery.settlement_service_type is None block = await web3.eth.get_block(tx_receipt_1["blockNumber"]) assert _delivery.create_blocktimestamp == datetime.fromtimestamp( block["timestamp"], UTC