style:add zx prefix for addr, --story=1012324

65d4e4e0 · mosesyzding · f0be4fb1 · 65d4e4e0
Commit 65d4e4e0 authored Sep 26, 2022 by mosesyzding
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 13 deletions

contractmgr/contract_manager.go contractmgr/contract_manager.go +15 -13

No files found.
--- a/contractmgr/contract_manager.go
+++ b/contractmgr/contract_manager.go
@@ -9,7 +9,6 @@ package contractmgr
 import (
 	"bytes"
-	"chainmaker.org/chainmaker/pb-go/v2/config"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -19,6 +18,8 @@ import (
 	"path/filepath"
 	"strings"
+	"chainmaker.org/chainmaker/pb-go/v2/config"
 	"github.com/google/uuid"
 	"chainmaker.org/chainmaker/pb-go/v2/accesscontrol"
@@ -29,8 +30,8 @@ import (
 	"chainmaker.org/chainmaker/vm-native/v2/common"
 )
-const(
+const (
-	ZXAddrPrefix  = "ZX"
+	zxlAddrPrefix = "ZX"
 )
 var (
@@ -108,6 +109,7 @@ func registerContractManagerMethods(log protocol.Logger) map[string]common.Contr
 //	return addr
 //}
+//addZXPrefixForContractAddr add zxl address prefix for contract
 func addZXPrefixForContractAddr(txSimContext protocol.TxSimContext, contract *commonPb.Contract) *commonPb.Contract {
 	cfg, _ := txSimContext.GetBlockchainStore().GetLastChainConfig()
@@ -116,17 +118,18 @@ func addZXPrefixForContractAddr(txSimContext protocol.TxSimContext, contract *co
 		return contract
 	}
-	contract.Address = ZXAddrPrefix + contract.Address
+	contract.Address = zxlAddrPrefix + contract.Address
 	return contract
 }
-func truncateZXPrefixForContractAddr(contract *commonPb.Contract) *commonPb.Contract {
+//truncateZXPrefixForContractAddr delete zxl address prefix
-	if contract.Address[0:2] == ZXAddrPrefix {
+//func truncateZXPrefixForContractAddr(contract *commonPb.Contract) *commonPb.Contract {
-		contract.Address = contract.Address[2:]
+//	if contract.Address[0:2] == zxlAddrPrefix {
-	}
+//		contract.Address = contract.Address[2:]
+//	}
-	return contract
+//
-}
+//	return contract
+//}
 func putContract(context protocol.TxSimContext, contract *commonPb.Contract) error {
 	cdata, err := contract.Marshal()
@@ -299,7 +302,6 @@ func (r *ContractManagerRuntime) fetchDisabledContractList(txSimContext protocol
 	for _, c := range contracts {
 		if c.Status == commonPb.ContractStatus_FROZEN {
 			disabledContractList = append(disabledContractList, c.Name)
-			c = addZXPrefixForContractAddr(txSimContext, c)
 		}
 	}
 	return disabledContractList, err
@@ -335,7 +337,7 @@ func (r *ContractManagerRuntime) getAllContracts(txSimContext protocol.TxSimCont
 			contract.RuntimeType = commonPb.RuntimeType_DOCKER_GO
 		}
-		contract = addZXPrefixForContractAddr(txSimContext, contract)
+		addZXPrefixForContractAddr(txSimContext, contract)
 	}
 	r.log.Debugf("getAllContracts result: %+v", contracts)
 	return json.Marshal(contracts)