Merge branch 'v2.3.1_qc_empty_getstate' into 'v2.3.1_qc' (merge request !53)

v2.3.1_qc_empty_getstate

Merge branch 'v2.3.1_qc_empty_getstate' into 'v2.3.1_qc' (merge request !53)
v2.3.1_qc_empty_getstate
c3709648 · tianle · a10e47ea · c205c38a · c3709648 · c3709648
Commit c3709648 authored 2 years ago by tianle
Showing with 15 additions and 5 deletions

runtime.go runtime.go +3 -2

runtime_handler.go runtime_handler.go +6 -2

test/utils.go test/utils.go +3 -1

test/v02_invokecontract_test.go test/v02_invokecontract_test.go +3 -0

No files found.
--- a/runtime.go
+++ b/runtime.go
@@ -25,8 +25,9 @@ import (
 )

 const (
-	mountContractDir = "contract-bins"
-	msgIterIsNil     = "iterator is nil"
+	mountContractDir        = "contract-bins"
+	msgIterIsNil            = "iterator is nil"
+	version2310      uint32 = 2030100
 )

 var dockerVMMsgPool = sync.Pool{

--- a/runtime_handler.go
+++ b/runtime_handler.go
@@ -335,8 +335,12 @@ func (r *RuntimeInstance) handleGetStateRequest(txId string, recvMsg *protogo.Do
 	})

 	response.SysCallMessage.Code = protocol.ContractSdkSignalResultSuccess
-	response.SysCallMessage.Payload = map[string][]byte{
-		config.KeyStateValue: value,
+
+	// nil value in map[string][]byte will be empty []byte after grpc transfer, old version ignored this problem
+	if txSimContext.GetBlockVersion() < version2310 || value != nil {
+		response.SysCallMessage.Payload = map[string][]byte{
+			config.KeyStateValue: value,
+		}
 	}
 	gasUsed, err = gas.GetStateGasUsed(gasUsed, value)
 	if err != nil {

--- a/test/utils.go
+++ b/test/utils.go
@@ -93,6 +93,8 @@ CpIO2ZrxkJ1Nm/FKZzMLQjp7Dm//xEMkpCbqqC6koOkRP2MKGSnEGXGfRr1QgBvr
 	cmCertAddressFromCert  = "305f98514f3c2f6fcaeb8247ed147bacf99990f8"

 	blockFingerprint = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+
+	version2310 uint32 = 2030100
 )

 var (
@@ -665,7 +667,7 @@ func mockGetBlockVersion(simContext *mock.MockTxSimContext) {

 // GetBlockVersion get block version
 func GetBlockVersion() uint32 {
-	return uint32(2300)
+	return version2310
 }

 // 获取sender公钥

--- a/test/v02_invokecontract_test.go
+++ b/test/v02_invokecontract_test.go
@@ -123,6 +123,9 @@ func TestDockerGoGetState(t *testing.T) {
 	parameters["field"] = []byte("field1")
 	parameters["value"] = []byte("500")
 	method := methodPutState
+	mockTxContext.EXPECT().GetBlockVersion().DoAndReturn(
+		GetBlockVersion,
+	).AnyTimes()

 	mockPut(mockTxContext, ContractNameTest, protocol.GetKey([]byte("key1"), []byte("field1")), []byte("500"))
 	result, _ := mockRuntimeInstance.Invoke(mockContractId, method, nil,