fix: deadlock when registering qgb evm address (#226)

celestiaorg · Oct 5, 2023 · dba851b · dba851b
1 parent d2291a4
commit dba851b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/testkit/appkit/app.go b/testkit/appkit/app.go
@@ -215,8 +215,6 @@ func (ak *AppKit) GetNodeId() (string, error) {
 }
 
 func (ak *AppKit) StartNode(loglvl string) error {
-	ak.m.Lock()
-	defer ak.m.Unlock()
 	ak.Cmd.ResetFlags()
 
 	// SetErr: send the error logs to stderr stream.
@@ -271,7 +269,7 @@ func (ak *AppKit) FundAccounts(accAdr, amount, krbackend, krpath string, accAddr
 func (ak *AppKit) RegisterEVMAddress(valoperAddr, evmAddr, krbackend, krpath, from string) error {
 	args := []string{"tx", "qgb", "register", valoperAddr, evmAddr}
 	args = append(args,
-		wrapFlag(flags.FlagBroadcastMode), flags.BroadcastBlock,
+		wrapFlag(flags.FlagBroadcastMode), flags.BroadcastSync,
 		wrapFlag(flags.FlagSkipConfirmation),
 		wrapFlag(flags.FlagFees), "100000utia",
 		wrapFlag(flags.FlagKeyringBackend), krbackend,

diff --git a/tests/helpers/qgb-sync/run_qgb.go b/tests/helpers/qgb-sync/run_qgb.go
@@ -263,11 +263,17 @@ func RunValidatorWithEVMAddress(runenv *runtime.RunEnv, initCtx *run.InitContext
 
 func RegisterEVMAddress(runenv *runtime.RunEnv, appcmd *appkit.AppKit, evmAddr *common2.Address) error {
 	runenv.RecordMessage("Registering EVM address for validator")
-	return appcmd.RegisterEVMAddress(
+	err := appcmd.RegisterEVMAddress(
 		appcmd.ValopAddress,
 		evmAddr.Hex(),
 		"test",
 		appcmd.GetHomePath(),
 		appcmd.AccountName,
 	)
+	if err != nil {
+		runenv.RecordMessage("Failed to register new EVM address for validator")
+		return err
+	}
+	runenv.RecordMessage("Registered new EVM address for validator successfully")
+	return nil
 }