feat: fix issues --story=0

2c6f8c1e · anadanxu · 64e1fa48 · 2c6f8c1e
Commit 2c6f8c1e authored Apr 30, 2025 by anadanxu
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

multisign/multi_sign_contract.go multisign/multi_sign_contract.go +6 -4

No files found.
--- a/multisign/multi_sign_contract.go
+++ b/multisign/multi_sign_contract.go
@@ -13,11 +13,9 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
-	"strings"
-
-	"chainmaker.org/chainmaker/pb-go/v2/config"

 	commonPb "chainmaker.org/chainmaker/pb-go/v2/common"
+	"chainmaker.org/chainmaker/pb-go/v2/config"
 	"chainmaker.org/chainmaker/pb-go/v2/syscontract"
 	"chainmaker.org/chainmaker/protocol/v2"
 	"chainmaker.org/chainmaker/utils/v2"
@@ -293,6 +291,10 @@ func (r *MultiSignRuntime) Trig(
 // updateMultiSignContract updates multi sign contract status in the context
 func (r *MultiSignRuntime) updateUserContract(txSimContext protocol.TxSimContext,
 	multiSignInfo *syscontract.MultiSignInfo) error {
+	// if the invoking tx is just the request tx, we don't need to update anything
+	if multiSignInfo.GetPayload().GetTxId() == txSimContext.GetTx().GetPayload().GetTxId() {
+		return nil
+	}
 	manageContractName := syscontract.SystemContract_CONTRACT_MANAGE.String()
 	if multiSignInfo.GetContractName() != manageContractName {
 		return nil
@@ -333,7 +335,7 @@ func (r *MultiSignRuntime) updateUserContract(txSimContext protocol.TxSimContext

 	// set install information or upgrade information for the contract
 	block, err := txSimContext.GetSnapshot().GetBlockchainStore().GetBlockByTx(multiSignInfo.GetPayload().GetTxId())
-	if err != nil && !strings.Contains(err.Error(), "value not found") {
+	if err != nil {
 		return fmt.Errorf("get block by tx id failed, error: %+v", err)
 	}
 	if multiSignInfo.Method == syscontract.ContractManageFunction_INIT_CONTRACT.String() {