Only verify auth sends on a verify-sends flag

cmd/root.go

@@ -258,7 +258,6 @@ var rootCmd = &cobra.Command{
 
 		// Send Messages
 		msgBody := viper.GetString("message")
-
 		time.Sleep(10 * time.Second)
 
 		// Accept auth request for this recipient
@@ -268,12 +267,16 @@ var rootCmd = &cobra.Command{
 		if viper.GetBool("accept-channel") {
 			done := make(chan struct{}, 1)
 			retryChan := make(chan struct{}, 1)
-			for {
 
+			if viper.GetBool("verify-sends") {
+				for {
 					rid := acceptChannel(client, recipientID)
+					// Verify message sends were successful
+
 					// Construct the callback function which
 					// verifies successful message send or retries
-				f := func(allRoundsSucceeded, timedOut bool, rounds map[id.Round]cmix.RoundResult) {
+					f := func(allRoundsSucceeded, timedOut bool,
+						rounds map[id.Round]cmix.RoundResult) {
 						if !allRoundsSucceeded {
 							retryChan <- struct{}{}
 						} else {
@@ -293,8 +296,9 @@ var rootCmd = &cobra.Command{
 					select {
 					case <-retryChan:
 						// On a retry, go to the top of the loop
-					jww.DEBUG.Printf("Confirmation message for relationship with %s "+
-						"were not sent successfully, resending messages...", recipientID)
+						jww.DEBUG.Printf("Confirmation message for relationship"+
+							" with %s were not sent successfully, resending "+
+							"messages...", recipientID)
 						continue
 					case <-done:
 						// Close channels on verification success
@@ -304,6 +308,9 @@ var rootCmd = &cobra.Command{
 					}
 					break
 				}
+			} else {
+				acceptChannel(client, recipientID)
+			}
 
 			// Do not wait for channel confirmations if we
 			// accepted one
@@ -318,7 +325,6 @@ var rootCmd = &cobra.Command{
 
 		// Send unsafe messages or not?
 		unsafe := viper.GetBool("unsafe")
-
 		sendAuthReq := viper.GetBool("send-auth-request")
 		if !unsafe && !authConfirmed && !isPrecanPartner &&
 			sendAuthReq {
@@ -441,8 +447,10 @@ 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)
+							f := func(allRoundsSucceeded, timedOut bool,
+								rounds map[id.Round]cmix.RoundResult) {
+								printRoundResults(allRoundsSucceeded, timedOut,
+									rounds, roundIDs, payload, recipientID)
 								if !allRoundsSucceeded {
 									retryChan <- struct{}{}
 								} else {
@@ -798,6 +806,7 @@ func addAuthenticatedChannel(client *messenger.Client, recipientID *id.ID,
 		done := make(chan struct{}, 1)
 		paramsE2E := e2e.GetDefaultParams()
 		roundTimeout := paramsE2E.CMIXParams.SendTimeout
+		if viper.GetBool("verify-sends") {
 			for {
 				// Construct the callback function which
 				// verifies successful message send or retries
@@ -837,6 +846,13 @@ func addAuthenticatedChannel(client *messenger.Client, recipientID *id.ID,
 				}
 				break
 			}
+		} else {
+			_, err := client.GetAuth().Request(recipientContact,
+				me.Facts)
+			if err != nil {
+				jww.FATAL.Panicf("%+v", err)
+			}
+		}
 
 	} else {
 		jww.ERROR.Printf("Could not add auth channel for %s",

cmd/utils.go

@@ -105,5 +105,6 @@ func readContact() contact.Contact {
 	}
 	jww.INFO.Printf("CONTACTPUBKEY READ: %s",
 		c.DhPubKey.TextVerbose(16, 0))
+	jww.INFO.Printf("Contact ID: %s", c.ID)
 	return c
 }