Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solve tech debt, refactor the flow to increase readability #243

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Solve tech debt, refactor the flow to increase readability #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions services/dkg/pedersen/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
18 changes: 8 additions & 10 deletions services/shuffle/neff/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
}
}

Expand Down Expand Up @@ -131,20 +131,18 @@ 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")

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()
Expand All @@ -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,
}
Expand Down