修改beacon接口返回变更引起的bug

api/node.py

@@ -27,9 +27,11 @@ async def subscribe(
         fund_collect: AgnosticCollection = Depends(dependencies.get_fund_collect),
         beacon_service: BeaconChaService = Depends(BeaconChaService)
 ):
-    node_detail_list = await beacon_service.get_validator(index_or_pubkey=create_node.pub_key)
-    assert node_detail_list, "节点不存在，绑定失败"
-    db_data = BaseNode(**create_node.dict(), index=node_detail_list[0].validator_index)
+    node_detail = await beacon_service.get_validator(index_or_pubkey=create_node.pub_key)
+    assert node_detail, "节点不存在，绑定失败"
+    if not isinstance(node_detail, Validator):
+        node_detail = node_detail[0]
+    db_data = BaseNode(**create_node.dict(), index=node_detail.validator_index)
     # 限制staking基金才可绑定节点
     query = {'id': create_node.fund_id, 'user_id': user.id, 'fund_type': FundType.staking}
     res = await fund_collect.update_one(
@@ -75,9 +77,11 @@ async def get_node_info(
         "nodes": {"$elemMatch": {"pub_key": pub_key}}
     })
     assert fund, NotFundError()
-    validator_detail_list = await beacon_service.get_validator(pub_key)
-    assert validator_detail_list, NotFundError()
-    response = Response[Validator](data=validator_detail_list[0])
+    validator_detail = await beacon_service.get_validator(pub_key)
+    if not isinstance(validator_detail, Validator):
+        validator_detail = validator_detail[0]
+    assert validator_detail, NotFundError()
+    response = Response[Validator](data=validator_detail)
     return response
 
 

service/beacon.py

@@ -61,24 +61,43 @@ class BeaconChaService:
         assert response["status"] == "OK", RequestHttpException()
         return response
 
-    async def get_validator(self, index_or_pubkey: Union[int, str]) -> List[Validator]:
+    async def get_validator(self, index_or_pubkey: Union[int, str]) -> Union[Validator, List[Validator]]:
         """获取质押信息"""
         url = f"{self.base_url}/api/v1/validator/{index_or_pubkey}"
         response = await self.service_request(url)
-        return [Validator(
-            activation_eligibility_epoch=item["activationeligibilityepoch"],
-            activation_epoch=item["activationepoch"],
-            validator_index=item["validatorindex"],
-            pubkey=item["pubkey"],
-            balance=item["balance"] / self.eth_decimal,
-            effective_balance=item["effectivebalance"] / self.eth_decimal,
-            exit_epoch=item["exitepoch"],
-            last_attestation_slot=item["lastattestationslot"],
-            slashed=item["slashed"],
-            status=item["status"],
-            withdraw_able_epoch=item["withdrawableepoch"],
-            withdrawal_credentials=item["withdrawalcredentials"],
-        ) for item in response["data"]]
+        if isinstance(response["data"], dict):
+            result = Validator(
+                activation_eligibility_epoch=response["data"]["activationeligibilityepoch"],
+                activation_epoch=response["data"]["activationepoch"],
+                validator_index=response["data"]["validatorindex"],
+                pubkey=response["data"]["pubkey"],
+                balance=response["data"]["balance"] / self.eth_decimal,
+                effective_balance=response["data"]["effectivebalance"] / self.eth_decimal,
+                exit_epoch=response["data"]["exitepoch"],
+                last_attestation_slot=response["data"]["lastattestationslot"],
+                slashed=response["data"]["slashed"],
+                status=response["data"]["status"],
+                withdraw_able_epoch=response["data"]["withdrawableepoch"],
+                withdrawal_credentials=response["data"]["withdrawalcredentials"],
+            )
+        elif isinstance(response["data"], list):
+            result = [Validator(
+                activation_eligibility_epoch=item["activationeligibilityepoch"],
+                activation_epoch=item["activationepoch"],
+                validator_index=item["validatorindex"],
+                pubkey=item["pubkey"],
+                balance=item["balance"] / self.eth_decimal,
+                effective_balance=item["effectivebalance"] / self.eth_decimal,
+                exit_epoch=item["exitepoch"],
+                last_attestation_slot=item["lastattestationslot"],
+                slashed=item["slashed"],
+                status=item["status"],
+                withdraw_able_epoch=item["withdrawableepoch"],
+                withdrawal_credentials=item["withdrawalcredentials"],
+            ) for item in response["data"]]
+        else:
+            raise RequestHttpException()
+        return result
 
     async def get_validator_deposit(self, index_or_pubkey: Union[int, str]):
         """获取质押信息"""