Merge branch 'fmt' of cwtch.im/cwtch into master

app/tui/main.go

@@ -1,14 +1,14 @@
 package main
 
 import (
-	"fmt"
-	"log"
-	"time"
 	"cwtch.im/cwtch/peer"
+	"fmt"
 	"github.com/marcusolsson/tui-go"
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
+	"time"
 )
 
 func main() {

peer/cwtch_peer.go

@@ -91,7 +91,7 @@ func (cp *CwtchPeer) ImportGroup(exportedInvite string) (groupID string, err err
 				if err == nil {
 					edpk := ed25519.PublicKey(pk)
 					onion := exportedInvite[5:21]
-					cp.Profile.AddContact(onion, &model.PublicProfile{Name:"", Ed25519PublicKey: edpk, Trusted: true, Blocked: false, Onion: onion})
+					cp.Profile.AddContact(onion, &model.PublicProfile{Name: "", Ed25519PublicKey: edpk, Trusted: true, Blocked: false, Onion: onion})
 					cp.Profile.ProcessInvite(cpp.GetGroupChatInvite(), onion)
 					return cpp.GroupChatInvite.GetGroupName(), nil
 				}

server/app/main.go

@@ -31,4 +31,4 @@ func main() {
 
 	// TODO load params from .cwtch/server.conf or command line flag
 	server.Run(serverConfig)
-}
+}

server/server.go

@@ -12,7 +12,7 @@ import (
 
 // Server encapsulates a complete, compliant Cwtch server.
 type Server struct {
-	app *application.RicochetApplication
+	app    *application.RicochetApplication
 	config *Config
 }
 

server/serverConfig.go

@@ -1,18 +1,18 @@
 package server
 
 import (
-	"sync"
+	"crypto/rsa"
+	"encoding/json"
 	"github.com/s-rah/go-ricochet/utils"
 	"io/ioutil"
 	"log"
-	"encoding/json"
+	"sync"
-	"crypto/rsa"
 )
 
 // Reporting is a struct for storing a the config a server needs to be a peer, and connect to a group to report
 type Reporting struct {
 	PeerPrivateKey      string `json:"privateKey"`
-	ReportingGroupID     string `json:"reportingGroupId"`
+	ReportingGroupID    string `json:"reportingGroupId"`
 	ReportingServerAddr string `json:"reportingServerAddr"`
 }
 

testing/cwtch_peer_server_intergration_test.go

@@ -129,7 +129,7 @@ func TestCwtchPeerIntegration(t *testing.T) {
 		serverAddr, _ = utils.GetOnionAddress(serverKey)
 		server = new(cwtchserver.Server)
 		fmt.Println("Starting cwtch server...")
-		config := cwtchserver.Config{ PrivateKeyBytes: utils.PrivateKeyToString(serverKey), MaxBufferLines: 100, ServerReporting: cwtchserver.Reporting{ } }
+		config := cwtchserver.Config{PrivateKeyBytes: utils.PrivateKeyToString(serverKey), MaxBufferLines: 100, ServerReporting: cwtchserver.Reporting{}}
 		go server.Run(&config)
 
 		// let tor get established