diff --git a/cmd/root.go b/cmd/root.go index aeca80079417004ec2e4a568bd594d2522ba5ec8..76935534eac87dc88fdc3d98a32e8fd92a5f2160 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -404,7 +404,7 @@ var rootCmd = &cobra.Command{ // Construct the callback function which // verifies successful message send or retries f := func(allRoundsSucceeded, timedOut bool, rounds map[id.Round]cmix.RoundResult) { - printRoundResults(allRoundsSucceeded, timedOut, rounds, roundIDs, payload, recipientID) + printRoundResults(rounds, roundIDs, payload, recipientID) if !allRoundsSucceeded { retryChan <- struct{}{} } else { diff --git a/cmd/utils.go b/cmd/utils.go index 631b473295a70649bd894c89868ba96b1eb43ed2..918ef1dc4e07945f7386a021f4cb2eb24132b8c2 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -36,12 +36,10 @@ func loadBackup(backupPath, backupPass string) (backupCrypto.Backup, []byte) { ////////////////// Print functions ///////////////////////////// ///////////////////////////////////////////////////////////////// -// Helper function which prints the round resuls -func printRoundResults(allRoundsSucceeded, timedOut bool, - rounds map[id.Round]cmix.RoundResult, roundIDs []id.Round, - payload []byte, recipient *id.ID) { +// Helper function which prints the round results +func printRoundResults(rounds map[id.Round]cmix.RoundResult, roundIDs []id.Round, payload []byte, recipient *id.ID) { - // Done as string slices for easy and human readable printing + // Done as string slices for easy and human-readable printing successfulRounds := make([]string, 0) failedRounds := make([]string, 0) timedOutRounds := make([]string, 0) @@ -71,8 +69,8 @@ func printRoundResults(allRoundsSucceeded, timedOut bool, jww.ERROR.Printf("\tRound(s) %v failed", strings.Join(failedRounds, ",")) } if len(timedOutRounds) > 0 { - jww.ERROR.Printf("\tRound(s) %v timed "+ - "\n\tout (no network resolution could be found)", strings.Join(timedOutRounds, ",")) + jww.ERROR.Printf("\tRound(s) %v timed out (no network resolution could be found)", + strings.Join(timedOutRounds, ",")) } } diff --git a/cmix/message/handler.go b/cmix/message/handler.go index 21dadc180da1c2b61a30e1fb2cd4c999cb15383d..842337d656d146daf2629ce8abf0c35afdfa3ae1 100644 --- a/cmix/message/handler.go +++ b/cmix/message/handler.go @@ -189,8 +189,7 @@ func (h *handler) handleMessageHelper(ecrMsg format.Message, bundle Bundle) bool go t.Process(ecrMsg, identity, round) } if len(services) == 0 { - jww.WARN.Printf("empty service list for %s: %s", - ecrMsg.Digest(), ecrMsg.GetSIH()) + jww.WARN.Printf("Empty service list for %s", ecrMsg.Digest()) } return true }