From 81639198fc9599d48bf5d07332c504bee79084a3 Mon Sep 17 00:00:00 2001
From: zaclew <lewchenchang@gmail.com>
Date: Wed, 23 Nov 2022 20:31:42 +0100
Subject: [PATCH] refactor the flow to increase readability

---
 services/dkg/pedersen/handler.go | 12 +++++-------
 services/shuffle/neff/handler.go | 18 ++++++++----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/services/dkg/pedersen/handler.go b/services/dkg/pedersen/handler.go
index 16071a6df..821113ddc 100644
--- a/services/dkg/pedersen/handler.go
+++ b/services/dkg/pedersen/handler.go
@@ -502,18 +502,16 @@ func (h *Handler) handleDecryptRequest(formID string) error {
 
 		accepted, msg := watchTx(events, tx.GetID())
 
-		if !accepted {
-			err = h.txmnger.Sync()
-			if err != nil {
-				return xerrors.Errorf("failed to sync manager: %v", err)
-			}
-		}
-
 		if accepted {
 			dela.Logger.Info().Msgf("pubShares accepted on the chain (index: %d)", h.privShare.I)
 			return nil
 		}
 
+		err = h.txmnger.Sync()
+		if err != nil {
+			return xerrors.Errorf("failed to sync manager: %v", err)
+		}
+
 		dela.Logger.Info().Msgf("submission of pubShares denied: %s", msg)
 
 		cancel()
diff --git a/services/shuffle/neff/handler.go b/services/shuffle/neff/handler.go
index d61b623dc..d943f9e7b 100644
--- a/services/shuffle/neff/handler.go
+++ b/services/shuffle/neff/handler.go
@@ -38,7 +38,7 @@ type Handler struct {
 	txmngr        txn.Manager
 	shuffleSigner crypto.Signer
 	context       serde.Context
-	formFac   serde.Factory
+	formFac       serde.Factory
 }
 
 // NewHandler creates a new handler
@@ -53,7 +53,7 @@ func NewHandler(me mino.Address, service ordering.Service, p pool.Pool,
 		txmngr:        txmngr,
 		shuffleSigner: shuffleSigner,
 		context:       ctx,
-		formFac:   formFac,
+		formFac:       formFac,
 	}
 }
 
@@ -131,13 +131,6 @@ func (h *Handler) handleStartShuffle(formID string) error {
 
 		accepted, msg := watchTx(events, tx.GetID())
 
-		if !accepted {
-			err = h.txmngr.Sync()
-			if err != nil {
-				return xerrors.Errorf("failed to sync manager: %v", err.Error())
-			}
-		}
-
 		if accepted {
 			dela.Logger.Info().Msg("our shuffling contribution has " +
 				"been accepted, we are exiting the process")
@@ -145,6 +138,11 @@ func (h *Handler) handleStartShuffle(formID string) error {
 			return nil
 		}
 
+		err = h.txmngr.Sync()
+		if err != nil {
+			return xerrors.Errorf("failed to sync manager: %v", err.Error())
+		}
+
 		dela.Logger.Info().Msg("shuffling contribution denied : " + msg)
 
 		cancel()
@@ -160,7 +158,7 @@ func makeTx(ctx serde.Context, form *etypes.Form, manager txn.Manager,
 	}
 
 	shuffleBallots := etypes.ShuffleBallots{
-		FormID:      form.FormID,
+		FormID:          form.FormID,
 		Round:           len(form.ShuffleInstances),
 		ShuffledBallots: shuffledBallots,
 	}