small QOL changes

api/client.go

@@ -36,7 +36,6 @@ import (
 	"gitlab.com/elixxir/primitives/ndf"
 	"gitlab.com/elixxir/primitives/switchboard"
 	goio "io"
-	"io/ioutil"
 	"time"
 )
 
@@ -162,10 +161,7 @@ func (cl *Client) Connect() error {
 		var gwCreds []byte
 		var err error
 		if gateway.TlsCertificate != "" {
-			gwCreds, err = ioutil.ReadFile(gateway.TlsCertificate)
-			if err != nil {
-				globals.Log.ERROR.Printf("Failed to read certificate at %s: %+v", gateway.TlsCertificate, err)
-			}
+			gwCreds = []byte(gateway.TlsCertificate)
 		}
 		gwID := id.NewNodeFromBytes(cl.ndf.Nodes[i].ID).NewGateway()
 		err = (cl.comm).(*io.Messaging).Comms.ConnectToGateway(gwID, gateway.Address, gwCreds)
@@ -176,16 +172,13 @@ func (cl *Client) Connect() error {
 
 	//connect to the registration server
 	if cl.ndf.Registration.Address != "" {
-		var cert []byte
+		var regCert []byte
 		var err error
 		if cl.ndf.Registration.TlsCertificate != "" {
-			cert, err = ioutil.ReadFile(cl.ndf.Registration.TlsCertificate)
-			if err != nil {
-				globals.Log.ERROR.Printf("failed to read certificate from %s: %+v", cl.ndf.Registration.TlsCertificate, err)
-			}
+			regCert = []byte(cl.ndf.Registration.TlsCertificate)
 		}
 		addr := io.ConnAddr(PermissioningAddrID)
-		err = (cl.comm).(*io.Messaging).Comms.ConnectToRegistration(addr, cl.ndf.Registration.Address, cert)
+		err = (cl.comm).(*io.Messaging).Comms.ConnectToRegistration(addr, cl.ndf.Registration.Address, regCert)
 		if err != nil {
 			globals.Log.ERROR.Printf("Failed connecting to permissioning: %+v", err)
 		}

cmd/root.go

@@ -36,14 +36,12 @@ import (
 var verbose bool
 var userId uint64
 var destinationUserId uint64
-var gwAddresses []string
 var message string
 var sessionFile string
 var dummyFrequency float64
 var noBlockingTransmission bool
 var rateLimiting uint32
 var showVer bool
-var gwCertPath string
 var registrationCertPath string
 var registrationCode string
 var userEmail string
@@ -513,11 +511,6 @@ func init() {
 
 	rootCmd.PersistentFlags().Uint64VarP(&userId, "userid", "i", 0,
 		"ID to sign in as")
-	rootCmd.PersistentFlags().StringSliceVarP(&gwAddresses, "gwaddresses",
-		"g", make([]string, 0), "Gateway addresses:port for message sending, "+
-			"comma-separated")
-	rootCmd.PersistentFlags().StringVarP(&gwCertPath, "gwcertpath", "c", "",
-		"Path to the certificate file for connecting to gateway using TLS")
 	rootCmd.PersistentFlags().StringVarP(&registrationCertPath, "registrationcertpath", "r",
 		"",
 		"Path to the certificate file for connecting to registration server"+