Fix merge conflicts

zeta-chain · Aug 2, 2024 · a665e67 · a665e67
1 parent 8e93dee
commit a665e67
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 3 deletions.
diff --git a/zetaclient/maintenance/tss_listener.go b/zetaclient/maintenance/tss_listener.go
@@ -129,7 +129,7 @@ func (tl *TSSListener) waitForNewKeyGeneration(ctx context.Context) error {
 func (tl *TSSListener) waitForNewKeygen(ctx context.Context) error {
 	// Initial Keygen retrieval
 	keygen, err := retry.DoTypedWithBackoffAndRetry(
-		func() (*observertypes.Keygen, error) { return tl.client.GetKeyGen(ctx) },
+		func() (observertypes.Keygen, error) { return tl.client.GetKeyGen(ctx) },
 		retry.DefaultConstantBackoff(),
 	)
 	if err != nil {
@@ -147,8 +147,6 @@ func (tl *TSSListener) waitForNewKeygen(ctx context.Context) error {
 			case err != nil:
 				tl.logger.Warn().Err(err).Msg("unable to get keygen")
 				continue
-			case keygenUpdated == nil:
-				continue
 			case keygenUpdated.Status == observertypes.KeygenStatus_PendingKeygen:
 				continue
 			case keygen.BlockNumber == keygenUpdated.BlockNumber:

diff --git a/zetaclient/testutils/mocks/zetacore_client.go b/zetaclient/testutils/mocks/zetacore_client.go