add back accidentally removed code and simplify related code

zhaoyf3509 · Mar 5, 2023 · 764d48e · 764d48e
1 parent 626ab50
commit 764d48e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/node/types/vm_block.py b/node/types/vm_block.py
@@ -2220,6 +2220,9 @@ def load(cls, data: bytearray):
         transactions = Vec[Transaction, u32].load(data)
         return cls(transactions=transactions)
 
+    def __iter__(self):
+        return iter(self.transactions)
+
 
 class BlockHeaderMetadata(Serialize, Deserialize):
     version = u16()

diff --git a/webui/webui.py b/webui/webui.py
@@ -204,7 +204,7 @@ async def block_route(request: Request):
             target_sum += solution["target"]
 
     txs = []
-    for tx in block.transactions.transactions:
+    for tx in block.transactions:
         tx: Transaction
         match tx.type:
             case Transaction.Type.Deploy:
@@ -247,7 +247,7 @@ async def transaction_route(request: Request):
 
     transaction: DeployTransaction | ExecuteTransaction | None = None
     transaction_type = ""
-    for tx in block.transactions.transactions:
+    for tx in block.transactions:
         match tx.type:
             case Transaction.Type.Deploy:
                 tx: DeployTransaction
@@ -346,7 +346,7 @@ async def transition_route(request: Request):
 
     transaction_id = None
     transition = None
-    for tx in block.transactions.transactions:
+    for tx in block.transactions:
         if tx.type == Transaction.Type.Deploy:
             tx: DeployTransaction
             if str(tx.fee.transition.id) == ts_id:
@@ -843,7 +843,7 @@ async def advanced_route(request: Request):
         block = await db.get_block_from_transaction_id(obj)
         if block is None:
             raise HTTPException(status_code=404, detail="Transaction not found")
-        for tx in block.transactions.transactions:
+        for tx in block.transactions:
             match tx.type:
                 case Transaction.Type.Execute:
                     tx: ExecuteTransaction
@@ -871,7 +871,7 @@ async def advanced_route(request: Request):
         block = await db.get_block_from_transition_id(obj)
         if block is None:
             raise HTTPException(status_code=404, detail="Transition not found")
-        for tx in block.transactions.transactions:
+        for tx in block.transactions:
             if tx.type == Transaction.Type.Execute:
                 tx: ExecuteTransaction
                 for ts in tx.execution.transitions: