queue confuse issue

coderkentzhang · coderkentzhang · commit 45bdcc8ef704 · 2023-05-24T16:16:09.000+08:00
diff --git a/bcos3sdk/bcos3callbackfuture.py b/bcos3sdk/bcos3callbackfuture.py
@@ -15,16 +15,17 @@
 # 在event监听场景比较有意义，目前先统一用wait，参见tests/testbcos3event.py
 
 class BcosCallbackFuture:
-    response_queue = queue.Queue(100)
+    response_queue = None
     context: BcosReqContext = None
  
     
     def __init__(self, context_name=None, context_msg=None):
-
+        self.response_queue = queue.Queue(100)
         if context_name is not None or context_msg is not None:
             self.context = BcosReqContext(self.next_seq(), context_name, context_msg)
         
         self.callback = BCOS_CALLBACK_FUNC(self.bcos_callback)
+        # print(f"when INIT {context_name}:{self.callback}:Queue:{self.response_queue}{self.context.detail()}")
         self.amop_callback = BCOS_AMOP_SUB_CALLBACK_FUNC(self.bcos_amop_callback)
         self.amop_publish_callback = BCOS_AMOP_PUBLISH_CALLBACK_FUNC(self.bcos_amop_publish_callback)
     
@@ -41,7 +42,9 @@ def bcos_callback(self, c_resp):
             return
         # print("bcos_callback-->",resp)
         resp = BcosResponse(c_resp)
-        # print(f"context_callback {self.context_callback.detail()}")
+        
+        #if(resp.context is not None):
+        #    print(f"when CALLBACK : {self.context.name},self seq:{self.context.seq}, response seq {resp.context.detail()}")
         self.response_queue.put_nowait(resp)
         # print(f"--->QSIZE::{self.queue.qsize()}------<<<<",)
     
diff --git a/bcos3sdk/bcos3client.py b/bcos3sdk/bcos3client.py
@@ -396,7 +396,7 @@ def call(self, to_address, contract_abi, fn_name,args=None,raw_func_data=None):
                                    s2b(functiondata),
                                    cbfuture.callback, byref(cbfuture.context))
         response = self.wait_result(cbfuture)
-        
+        # print(f"in call response is {response},cbfuture context {cbfuture.context.detail()}")
         if "status" in response.keys():
             status = response["status"]
             error_message = transaction_status_code.TransactionStatusCode.get_error_message(status)
@@ -427,6 +427,7 @@ def call(self, to_address, contract_abi, fn_name,args=None,raw_func_data=None):
     '''
     def sendRawTransactionData(self,  raw_tx_data):
         cbfuture = BcosCallbackFuture(sys._getframe().f_code.co_name, "")
+        
         self.bcossdk.bcos_rpc_send_transaction(self.bcossdk.sdk, s2b(self.group), s2b(self.node),
                                                s2b(raw_tx_data),
                                                0, cbfuture.callback, byref(cbfuture.context))
diff --git a/bcos3sdk/bcos3datadef.py b/bcos3sdk/bcos3datadef.py
@@ -53,12 +53,12 @@ def extract_response(self, c_resp):
             self.desc = b2s(c_resp.contents.desc)
         else:
             self.desc = ""
-        self.context_callback = c_resp.contents.get_context()
+        self.context = c_resp.contents.get_context()
         return self
     
     def detail(self):
         str = f"error:{self.error},size:{self.size},data:{self.data},desc:{self.desc}."
-        c = self.context_callback
+        c = self.context
         if c is not None:
             str = str + (" | context:({}),{},[{}]".format(c.seq, b2s(c.name), b2s(c.msg)))
         return str
diff --git a/bcos3sdk/transaction_status.py b/bcos3sdk/transaction_status.py
@@ -81,11 +81,11 @@ def get_error_message(error_code):
     def convert_error_code(error_code):
         if isinstance(error_code, int):
             error_code = str(error_code)
-        return TransactionStatus.get_error_message(error_code)
+        return error_code
     
     @staticmethod
     def isOK(input):
         if str(input) == TransactionStatus.OK:
             return True
         else:
-            return False
+            return False
