Merge branch 'v2.3.1_qc' into 'develop' (merge request !37)

v2.3.1_qc

Merge branch 'v2.3.1_qc' into 'develop' (merge request !37)
v2.3.1_qc
37d72bd5 · tianle · e7219ed0 · 39be28fc · 37d72bd5 · 37d72bd5
Commit 37d72bd5 authored Dec 20, 2022 by tianle
Showing with 12 additions and 8 deletions

sandbox/runtime_client.go sandbox/runtime_client.go +1 -2

sandbox/tx_handler.go sandbox/tx_handler.go +2 -5

sdk/response.go sdk/response.go +8 -0

sdk/sdk.go sdk/sdk.go +1 -1

No files found.
--- a/sandbox/runtime_client.go
+++ b/sandbox/runtime_client.go
@@ -132,8 +132,7 @@ func (r *RuntimeClient) PutMsgWithNotify(msg *protogo.DockerVMMessage,

 // PutMsg put msg to send channel
 func (r *RuntimeClient) PutMsg(msg *protogo.DockerVMMessage) {
-	r.logger.Debugf("put msg to sendMsgCh, txId [%s], msgType [%s], chan len: [%d]",
-		msg.TxId, msg.Type, len(r.sendMsgCh))
+	r.logger.Debugf("put msg to sendMsgCh, txId [%s], chan len: [%d]", msg.TxId, len(r.sendMsgCh))

 	r.sendMsgCh <- msg
 }

--- a/sandbox/tx_handler.go
+++ b/sandbox/tx_handler.go
@@ -17,9 +17,6 @@ import (
 )

 const (
-	_dockerGoMethodInitContract    = "InitContract"
-	_dockerGoMethodUpgradeContract = "UpgradeContract"
-
 	_initContract    = "init_contract"
 	_upgradeContract = "upgrade"
 	_invokeContract  = "invoke_contract" //Compatible with version < 2.3.0
@@ -92,7 +89,7 @@ func (h *TxHandler) listenPendingQueue() error {
 	for {
 		select {
 		case msg := <-h.pendingQueue:
-			h.sandboxLogger.Debugf("get msg from pending queue, txId: [%s], msgType: [%s]", msg.TxId, msg.Type)
+			h.sandboxLogger.Debugf("get msg from pending queue, txId: [%s]", msg.TxId)
 			if err := h.handleTxRequest(msg); err != nil {
 				errCh <- err
 			}
@@ -204,7 +201,7 @@ func (h *TxHandler) handleTxRequest(msg *protogo.DockerVMMessage) error {
 		txResponse.WriteMap = nil
 		txResponse.ReadMap = nil
 		txResponse.Events = nil
-		if method == _dockerGoMethodInitContract || method == _dockerGoMethodUpgradeContract {
+		if method == _initContract || method == _upgradeContract {
 			signal.Type = protogo.DockerVMType_ERROR
 		}
 	}

--- a/sdk/response.go
+++ b/sdk/response.go
@@ -28,6 +28,14 @@ func Success(payload []byte) protogo.Response {
 	}
 }

+// Success normal
+func SuccessNormal() protogo.Response {
+	return protogo.Response{
+		Status:  OK,
+		Payload: []byte("success"),
+	}
+}
+
 // Error ...
 func Error(msg string) protogo.Response {
 	return protogo.Response{

--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -684,7 +684,7 @@ func (s *SDK) CallContract(contractName, method string, args map[string][]byte)
 		return protogo.Response{
 			Status:  ERROR,
 			Message: result.SysCallMessage.Message,
-			Payload: nil,
+			Payload: result.SysCallMessage.Payload[KeyCallContractResp],
 		}
 	}