From 2981cb4dace74edad56569ddacf48fa39840d2fb Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Fri, 29 Jun 2018 12:20:07 -0700 Subject: [PATCH] Formatting & Adding to Quality --- model/group.go | 2 +- model/profile.go | 2 +- peer/connections/peerpeerconnection.go | 2 +- peer/cwtch_peer_test.go | 4 ++-- peer/fetch/peer_fetch_channel.go | 2 +- peer/fetch/peer_fetch_channel_test.go | 2 +- peer/listen/peer_listen_channel.go | 2 +- peer/listen/peer_listen_channel_test.go | 2 +- peer/peer/peer_channel.go | 2 +- peer/peer/peer_channel_test.go | 2 +- peer/send/peer_send_channel.go | 2 +- peer/send/peer_send_channel_test.go | 2 +- protocol/spam/spamguard.go | 2 +- protocol/spam/spamguard_test.go | 2 +- server/fetch/server_fetch_channel.go | 2 +- server/fetch/server_fetch_channel_test.go | 2 +- server/listen/server_listen_channel.go | 2 +- server/listen/server_listen_channel_test.go | 2 +- server/send/server_send_channel.go | 2 +- server/send/server_send_channel_test.go | 2 +- testing/cwtch_peer_server_intergration_test.go | 6 +++--- testing/quality.sh | 4 ++++ 22 files changed, 28 insertions(+), 24 deletions(-) diff --git a/model/group.go b/model/group.go index 7bb9f88..6907c6b 100644 --- a/model/group.go +++ b/model/group.go @@ -5,8 +5,8 @@ import ( "cwtch.im/cwtch/protocol" "errors" "fmt" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "github.com/golang/protobuf/proto" "golang.org/x/crypto/nacl/secretbox" "io" "sync" diff --git a/model/profile.go b/model/profile.go index 40a1af2..1456159 100644 --- a/model/profile.go +++ b/model/profile.go @@ -6,8 +6,8 @@ import ( "cwtch.im/cwtch/protocol" "encoding/asn1" "errors" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "github.com/golang/protobuf/proto" "golang.org/x/crypto/ed25519" "io" "sync" diff --git a/peer/connections/peerpeerconnection.go b/peer/connections/peerpeerconnection.go index 94b2ad7..5515137 100644 --- a/peer/connections/peerpeerconnection.go +++ b/peer/connections/peerpeerconnection.go @@ -1,13 +1,13 @@ package connections import ( + "cwtch.im/cwtch/model" "cwtch.im/cwtch/peer/peer" "cwtch.im/cwtch/protocol" "git.openprivacy.ca/openprivacy/libricochet-go" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/connection" "git.openprivacy.ca/openprivacy/libricochet-go/identity" - "cwtch.im/cwtch/model" "log" "time" ) diff --git a/peer/cwtch_peer_test.go b/peer/cwtch_peer_test.go index 312ac9a..e83b717 100644 --- a/peer/cwtch_peer_test.go +++ b/peer/cwtch_peer_test.go @@ -6,10 +6,10 @@ import ( func TestCwtchPeerGenerate(t *testing.T) { - alice := NewCwtchPeer("alice","testpass") + alice := NewCwtchPeer("alice", "testpass") alice.Save("./test_profile") - aliceLoaded, err := LoadCwtchPeer("./test_profile","testpass") + aliceLoaded, err := LoadCwtchPeer("./test_profile", "testpass") if err != nil || aliceLoaded.GetProfile().Name != "alice" { t.Errorf("something went wrong saving and loading profiles %v %v", err, aliceLoaded) } diff --git a/peer/fetch/peer_fetch_channel.go b/peer/fetch/peer_fetch_channel.go index faf0bd4..50c9c92 100644 --- a/peer/fetch/peer_fetch_channel.go +++ b/peer/fetch/peer_fetch_channel.go @@ -3,10 +3,10 @@ package fetch import ( "cwtch.im/cwtch/protocol" "errors" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/utils" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" ) // CwtchPeerFetchChannel is the peer implementation of the im.cwtch.server.fetch diff --git a/peer/fetch/peer_fetch_channel_test.go b/peer/fetch/peer_fetch_channel_test.go index d05dfff..7f63593 100644 --- a/peer/fetch/peer_fetch_channel_test.go +++ b/peer/fetch/peer_fetch_channel_test.go @@ -2,9 +2,9 @@ package fetch import ( "cwtch.im/cwtch/protocol" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "testing" "time" ) diff --git a/peer/listen/peer_listen_channel.go b/peer/listen/peer_listen_channel.go index a688172..032cdd3 100644 --- a/peer/listen/peer_listen_channel.go +++ b/peer/listen/peer_listen_channel.go @@ -3,10 +3,10 @@ package listen import ( "cwtch.im/cwtch/protocol" "errors" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/utils" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" ) // CwtchPeerListenChannel is the peer implementation of im.cwtch.server.listen diff --git a/peer/listen/peer_listen_channel_test.go b/peer/listen/peer_listen_channel_test.go index 5ba89bd..6f8ddf7 100644 --- a/peer/listen/peer_listen_channel_test.go +++ b/peer/listen/peer_listen_channel_test.go @@ -2,9 +2,9 @@ package listen import ( "cwtch.im/cwtch/protocol" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "testing" "time" ) diff --git a/peer/peer/peer_channel.go b/peer/peer/peer_channel.go index 0b75af5..f84e29f 100644 --- a/peer/peer/peer_channel.go +++ b/peer/peer/peer_channel.go @@ -2,10 +2,10 @@ package peer import ( "cwtch.im/cwtch/protocol" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/utils" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "log" ) diff --git a/peer/peer/peer_channel_test.go b/peer/peer/peer_channel_test.go index 2239f78..db378ef 100644 --- a/peer/peer/peer_channel_test.go +++ b/peer/peer/peer_channel_test.go @@ -2,9 +2,9 @@ package peer import ( "cwtch.im/cwtch/protocol" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "testing" ) diff --git a/peer/send/peer_send_channel.go b/peer/send/peer_send_channel.go index 6640fbe..f6426da 100644 --- a/peer/send/peer_send_channel.go +++ b/peer/send/peer_send_channel.go @@ -4,10 +4,10 @@ import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/protocol/spam" "errors" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/utils" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" ) // CwtchPeerSendChannel is the peer implementation of im.cwtch.server.send diff --git a/peer/send/peer_send_channel_test.go b/peer/send/peer_send_channel_test.go index 7309a81..4715c1d 100644 --- a/peer/send/peer_send_channel_test.go +++ b/peer/send/peer_send_channel_test.go @@ -3,9 +3,9 @@ package send import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/protocol/spam" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "testing" ) diff --git a/protocol/spam/spamguard.go b/protocol/spam/spamguard.go index 36af560..6330a4f 100644 --- a/protocol/spam/spamguard.go +++ b/protocol/spam/spamguard.go @@ -4,9 +4,9 @@ import ( "crypto/rand" "crypto/sha256" "cwtch.im/cwtch/protocol" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/utils" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "io" //"fmt" ) diff --git a/protocol/spam/spamguard_test.go b/protocol/spam/spamguard_test.go index caa2234..aada34f 100644 --- a/protocol/spam/spamguard_test.go +++ b/protocol/spam/spamguard_test.go @@ -2,8 +2,8 @@ package spam import ( "cwtch.im/cwtch/protocol" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "testing" ) diff --git a/server/fetch/server_fetch_channel.go b/server/fetch/server_fetch_channel.go index 51e67ef..f2eebc1 100644 --- a/server/fetch/server_fetch_channel.go +++ b/server/fetch/server_fetch_channel.go @@ -3,10 +3,10 @@ package fetch import ( "cwtch.im/cwtch/protocol" "errors" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/utils" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" ) // CwtchServerFetchChannel implements the ChannelHandler interface for a channel of diff --git a/server/fetch/server_fetch_channel_test.go b/server/fetch/server_fetch_channel_test.go index eb215ec..7f1aef3 100644 --- a/server/fetch/server_fetch_channel_test.go +++ b/server/fetch/server_fetch_channel_test.go @@ -2,9 +2,9 @@ package fetch import ( "cwtch.im/cwtch/protocol" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "testing" ) diff --git a/server/listen/server_listen_channel.go b/server/listen/server_listen_channel.go index d935306..af9b3d9 100644 --- a/server/listen/server_listen_channel.go +++ b/server/listen/server_listen_channel.go @@ -3,10 +3,10 @@ package listen import ( "cwtch.im/cwtch/protocol" "errors" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/utils" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" ) // CwtchServerListenChannel implements the ChannelHandler interface for a channel of diff --git a/server/listen/server_listen_channel_test.go b/server/listen/server_listen_channel_test.go index f7309f4..ee1bfa8 100644 --- a/server/listen/server_listen_channel_test.go +++ b/server/listen/server_listen_channel_test.go @@ -2,9 +2,9 @@ package listen import ( "cwtch.im/cwtch/protocol" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "testing" ) diff --git a/server/send/server_send_channel.go b/server/send/server_send_channel.go index 186c0e5..5421b4d 100644 --- a/server/send/server_send_channel.go +++ b/server/send/server_send_channel.go @@ -4,9 +4,9 @@ import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/protocol/spam" "errors" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "log" ) diff --git a/server/send/server_send_channel_test.go b/server/send/server_send_channel_test.go index 9eac92b..7e963ba 100644 --- a/server/send/server_send_channel_test.go +++ b/server/send/server_send_channel_test.go @@ -3,9 +3,9 @@ package send import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/protocol/spam" - "github.com/golang/protobuf/proto" "git.openprivacy.ca/openprivacy/libricochet-go/channels" "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" + "github.com/golang/protobuf/proto" "testing" ) diff --git a/testing/cwtch_peer_server_intergration_test.go b/testing/cwtch_peer_server_intergration_test.go index 0615de6..edeeda7 100644 --- a/testing/cwtch_peer_server_intergration_test.go +++ b/testing/cwtch_peer_server_intergration_test.go @@ -143,17 +143,17 @@ func TestCwtchPeerIntegration(t *testing.T) { // ***** Peer setup ***** fmt.Println("Creating Alice...") - alice := peer.NewCwtchPeer("Alice","alicepass") + alice := peer.NewCwtchPeer("Alice", "alicepass") go alice.Listen() fmt.Println("Alice created:", alice.GetProfile().Onion) fmt.Println("Creating Bob...") - bob := peer.NewCwtchPeer("Bob","bobpass") + bob := peer.NewCwtchPeer("Bob", "bobpass") go bob.Listen() fmt.Println("Bob created:", bob.GetProfile().Onion) fmt.Println("Creating Carol...") - carol := peer.NewCwtchPeer("Carol","carolpass") + carol := peer.NewCwtchPeer("Carol", "carolpass") go carol.Listen() fmt.Println("Carol created:", carol.GetProfile().Onion) diff --git a/testing/quality.sh b/testing/quality.sh index 87db32f..6a4431d 100755 --- a/testing/quality.sh +++ b/testing/quality.sh @@ -10,3 +10,7 @@ echo "" echo "Linting:" go list ./... | xargs golint + + +echo "Time to format" +gofmt -l -s -w .