feat:modify getContractInfo, --story=1012324

cc600bdd · mosesyzding · 06706aac · cc600bdd
Commit cc600bdd authored Sep 27, 2022 by mosesyzding
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 12 deletions

contractmgr/contract_manager.go contractmgr/contract_manager.go +11 -12

No files found.
--- a/contractmgr/contract_manager.go
+++ b/contractmgr/contract_manager.go
@@ -311,22 +311,21 @@ func (r *ContractManagerRuntime) fetchDisabledContractList(txSimContext protocol
 func (r *ContractManagerRuntime) getContractInfo(txSimContext protocol.TxSimContext, parameters map[string][]byte) (
 	[]byte, error) {
 	name := string(parameters[syscontract.GetContractInfo_CONTRACT_NAME.String()])
-	contract, err := r.GetContractInfo(txSimContext, name)
+	cfg, err := txSimContext.GetBlockchainStore().GetLastChainConfig()
 	if err != nil {
-		cfg, e := txSimContext.GetBlockchainStore().GetLastChainConfig()
+		return nil, err
-		if e != nil {
+	}
-			return nil, err
-		}
-		if cfg.Vm.AddrType == config.AddrType_ZXL && txSimContext.GetBlockVersion() >= 2300 &&
+	if cfg.Vm.AddrType == config.AddrType_ZXL && txSimContext.GetBlockVersion() >= 2300 &&
-			utils.CheckZxlAddrFormat(name) {
+		utils.CheckZxlAddrFormat(name) {
-			contract, err = r.GetContractInfo(txSimContext, name[2:])
+		name = name[2:]
-		}
+	}
-		if err != nil || len(contract.Name) == 0 {
+	contract, err := r.GetContractInfo(txSimContext, name)
-			return nil, err
+	if err != nil {
-		}
+		return nil, err
 	}
 	// RuntimeType_GO is not exposed in v230
 	if contract.RuntimeType == commonPb.RuntimeType_GO {
 		contract.RuntimeType = commonPb.RuntimeType_DOCKER_GO