Make DeployContract as const

Signed-off-by: Alexey Semenyuk <[email protected]>
hyperledger · Mar 21, 2024 · f4be7bf · f4be7bf
1 parent 5ada2cf
commit f4be7bf
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/internal/apiserver/route_post_contract_deploy_test.go b/internal/apiserver/route_post_contract_deploy_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -40,7 +40,7 @@ func TestPostContractDeploy(t *testing.T) {
 	req.Header.Set("Content-Type", "application/json; charset=utf-8")
 	res := httptest.NewRecorder()
 
-	mcm.On("DeployContract", mock.Anything, mock.MatchedBy(func(req *core.ContractDeployRequest) bool {
+	mcm.On(core.DeployContract, mock.Anything, mock.MatchedBy(func(req *core.ContractDeployRequest) bool {
 		return true
 	}), false).Return("banana", nil)
 	r.ServeHTTP(res, req)

diff --git a/internal/blockchain/ethereum/ethereum.go b/internal/blockchain/ethereum/ethereum.go
@@ -735,7 +735,7 @@ func (e *Ethereum) DeployContract(ctx context.Context, nsOpID, signingKey string
 		e.metrics.BlockchainContractDeployment()
 	}
 	headers := EthconnectMessageHeaders{
-		Type: "DeployContract",
+		Type: core.DeployContract,
 		ID:   nsOpID,
 	}
 	body := map[string]interface{}{
@@ -745,9 +745,7 @@ func (e *Ethereum) DeployContract(ctx context.Context, nsOpID, signingKey string
 		"definition": definition,
 		"contract":   contract,
 	}
-	if signingKey != "" {
-		body["from"] = signingKey
-	}
+
 	body, err = e.applyOptions(ctx, body, options)
 	if err != nil {
 		return true, err

diff --git a/internal/blockchain/ethereum/ethereum_test.go b/internal/blockchain/ethereum/ethereum_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -2604,7 +2604,7 @@ func TestDeployContractOK(t *testing.T) {
 			json.NewDecoder(req.Body).Decode(&body)
 			params := body["params"].([]interface{})
 			headers := body["headers"].(map[string]interface{})
-			assert.Equal(t, "DeployContract", headers["type"])
+			assert.Equal(t, core.DeployContract, headers["type"])
 			assert.Equal(t, float64(1), params[0])
 			assert.Equal(t, "1000000000000000000000000", params[1])
 			assert.Equal(t, body["customOption"].(string), "customValue")
@@ -2686,7 +2686,7 @@ func TestDeployContractInvalidOption(t *testing.T) {
 			json.NewDecoder(req.Body).Decode(&body)
 			params := body["params"].([]interface{})
 			headers := body["headers"].(map[string]interface{})
-			assert.Equal(t, "DeployContract", headers["type"])
+			assert.Equal(t, core.DeployContract, headers["type"])
 			assert.Equal(t, float64(1), params[0])
 			assert.Equal(t, "1000000000000000000000000", params[1])
 			assert.Equal(t, body["customOption"].(string), "customValue")

diff --git a/internal/blockchain/fabric/fabric_test.go b/internal/blockchain/fabric/fabric_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -2529,7 +2529,7 @@ func TestDeployContractOK(t *testing.T) {
 			json.NewDecoder(req.Body).Decode(&body)
 			params := body["params"].([]interface{})
 			headers := body["headers"].(map[string]interface{})
-			assert.Equal(t, "DeployContract", headers["type"])
+			assert.Equal(t, core.DeployContract, headers["type"])
 			assert.Equal(t, float64(1), params[0])
 			assert.Equal(t, "1000000000000000000000000", params[1])
 			assert.Equal(t, body["customOption"].(string), "customValue")

diff --git a/internal/blockchain/tezos/tezos.go b/internal/blockchain/tezos/tezos.go
@@ -315,16 +315,15 @@ func (t *Tezos) DeployContract(ctx context.Context, nsOpID, signingKey string, d
 		t.metrics.BlockchainContractDeployment()
 	}
 	headers := TezosconnectMessageHeaders{
-		Type: "DeployContract",
+		Type: core.DeployContract,
 		ID:   nsOpID,
 	}
 	body := map[string]interface{}{
 		"headers":  &headers,
 		"contract": contract,
+		"from":     signingKey,
 	}
-	if signingKey != "" {
-		body["from"] = signingKey
-	}
+
 	body, err = t.applyOptions(ctx, body, options)
 	if err != nil {
 		return true, err

diff --git a/internal/blockchain/tezos/tezos_test.go b/internal/blockchain/tezos/tezos_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -990,7 +990,7 @@ func TestDeployContractOK(t *testing.T) {
 			var body map[string]interface{}
 			json.NewDecoder(req.Body).Decode(&body)
 			headers := body["headers"].(map[string]interface{})
-			assert.Equal(t, "DeployContract", headers["type"])
+			assert.Equal(t, core.DeployContract, headers["type"])
 			assert.Equal(t, "123", headers["id"])
 			assert.Equal(t, contract, body["contract"])
 			return httpmock.NewJsonResponderOrPanic(200, "")(req)
@@ -1048,7 +1048,7 @@ func TestDeployContractInvalidOption(t *testing.T) {
 			var body map[string]interface{}
 			json.NewDecoder(req.Body).Decode(&body)
 			headers := body["headers"].(map[string]interface{})
-			assert.Equal(t, "DeployContract", headers["type"])
+			assert.Equal(t, core.DeployContract, headers["type"])
 			assert.Equal(t, "123", headers["id"])
 			assert.Equal(t, contract, body["contract"])
 			return httpmock.NewJsonResponderOrPanic(200, "")(req)

diff --git a/pkg/core/constants.go b/pkg/core/constants.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -62,3 +62,8 @@ const (
 	// SystemTagIdentityUpdate is the tag for messages that broadcast an identity update
 	SystemTagIdentityUpdate = "ff_identity_update"
 )
+
+const (
+	// DeployContract is the header for DeployContract request
+	DeployContract = "DeployContract"
+)