From e382c8eb6995a7945a91b54e3660c8b82e4b02bb Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Fri, 8 Jun 2018 14:54:31 -0700 Subject: [PATCH] Rename --- CONTRIBUTING.md | 4 ++-- README.md | 8 ++++---- application/application.go | 8 ++++---- application/application_factory.go | 4 ++-- application/examples/echobot/main.go | 8 ++++---- channels/chatchannel.go | 6 +++--- channels/chatchannel_test.go | 6 +++--- channels/contactrequestchannel.go | 6 +++--- channels/contactrequestchannel_test.go | 6 +++--- channels/handler.go | 2 +- channels/hiddenserviceauthchannel.go | 8 ++++---- channels/hiddenserviceauthchannel_test.go | 6 +++--- connection/authorizationmanager.go | 2 +- connection/autoconnectionhandler.go | 4 ++-- connection/autoconnectionhandler_test.go | 6 +++--- connection/channelmanager.go | 4 ++-- connection/channelmanager_test.go | 2 +- connection/connection.go | 6 +++--- connection/connection_test.go | 4 ++-- connection/control_channel.go | 4 ++-- connection/control_channel_test.go | 6 +++--- connection/handler.go | 2 +- connection/inboundconnectionhandler.go | 8 ++++---- connection/outboundconnectionhandler.go | 8 ++++---- examples/echobot/main.go | 10 +++++----- identity/identity.go | 2 +- inbound_version_negotiation_test.go | 2 +- outbound_version_negotiation_test.go | 2 +- policies/timeoutpolicy.go | 2 +- ricochet.go | 4 ++-- testing/integration_test.go | 6 +++--- utils/messagebuilder.go | 8 ++++---- utils/messagebuilder_test.go | 2 +- wire/auth/auth_message.go | 2 +- wire/contact/request.go | 2 +- 35 files changed, 85 insertions(+), 85 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e400cd7..dbe937e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,11 +33,11 @@ can check coverage `with go test --cover github.com/s-rah/go-ricochet` Format your code (the path might be slightly different): -* `gofmt -l=true -s -w src/github.com/s-rah/go-ricochet/` +* `gofmt -l=true -s -w src/git.openprivacy.ca/openprivacy/libricochet-go/` Run the following commands, and address any issues which arise: -* `go vet github.com/s-rah/go-ricochet/...` +* `go vet git.openprivacy.ca/openprivacy/libricochet-go/...` * `/golint application/ channels/ connection/ examples/ identity/ policies/ testing/ utils` ## 4. Code Review diff --git a/README.md b/README.md index 1e82eb8..c16ae94 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# GoRicochet [![Build Status](https://travis-ci.org/s-rah/go-ricochet.svg?branch=master)](https://travis-ci.org/s-rah/go-ricochet) [![Go Report Card](https://goreportcard.com/badge/github.com/s-rah/go-ricochet)](https://goreportcard.com/report/github.com/s-rah/go-ricochet) [![Coverage Status](https://coveralls.io/repos/github/s-rah/go-ricochet/badge.svg?branch=master)](https://coveralls.io/github/s-rah/go-ricochet?branch=master) +# libricochet-go [![Build Status](https://travis-ci.org/s-rah/go-ricochet.svg?branch=master)](https://travis-ci.org/s-rah/go-ricochet) [![Go Report Card](https://goreportcard.com/badge/github.com/s-rah/go-ricochet)](https://goreportcard.com/report/github.com/s-rah/go-ricochet) [![Coverage Status](https://coveralls.io/repos/github/s-rah/go-ricochet/badge.svg?branch=master)](https://coveralls.io/github/s-rah/go-ricochet?branch=master) -GoRicochet is an experimental implementation of the [Ricochet Protocol](https://ricochet.im) +libricochet-go is an experimental implementation of the [Ricochet Protocol](https://ricochet.im) in Go. ## Features @@ -15,8 +15,8 @@ Below is a simple echo bot, which responds to any chat message. You can also fin package main import ( - "github.com/s-rah/go-ricochet/application" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/application" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "log" "time" ) diff --git a/application/application.go b/application/application.go index d56aa8a..5321dae 100644 --- a/application/application.go +++ b/application/application.go @@ -2,10 +2,10 @@ package application import ( "crypto/rsa" - "github.com/s-rah/go-ricochet" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/connection" - "github.com/s-rah/go-ricochet/identity" + "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" "log" "net" "sync" diff --git a/application/application_factory.go b/application/application_factory.go index 1394476..1710915 100644 --- a/application/application_factory.go +++ b/application/application_factory.go @@ -1,8 +1,8 @@ package application import ( - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/connection" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/connection" ) // ApplicationInstance is a concrete instance of a ricochet application, encapsulating a connection diff --git a/application/examples/echobot/main.go b/application/examples/echobot/main.go index 91a8932..457af6f 100644 --- a/application/examples/echobot/main.go +++ b/application/examples/echobot/main.go @@ -1,9 +1,9 @@ package main import ( - "github.com/s-rah/go-ricochet/application" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/application" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "log" "time" ) @@ -84,7 +84,7 @@ func main() { } }) - echobot.Init(pk, af, new(application.AcceptAllContactManager)) + echobot.Init("echobot", pk, af, new(application.AcceptAllContactManager)) log.Printf("echobot listening on %s", l.Addr().String()) echobot.Run(l) } diff --git a/channels/chatchannel.go b/channels/chatchannel.go index f14c394..767e43b 100644 --- a/channels/chatchannel.go +++ b/channels/chatchannel.go @@ -2,9 +2,9 @@ package channels import ( "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/chat" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/chat" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "time" ) diff --git a/channels/chatchannel_test.go b/channels/chatchannel_test.go index b1beecd..64ab187 100644 --- a/channels/chatchannel_test.go +++ b/channels/chatchannel_test.go @@ -2,9 +2,9 @@ package channels import ( "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/chat" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/chat" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" "time" ) diff --git a/channels/contactrequestchannel.go b/channels/contactrequestchannel.go index ba1b83a..d2a3f66 100644 --- a/channels/contactrequestchannel.go +++ b/channels/contactrequestchannel.go @@ -2,9 +2,9 @@ package channels import ( "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/contact" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/contact" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" ) // Defining Versions diff --git a/channels/contactrequestchannel_test.go b/channels/contactrequestchannel_test.go index 816ff8f..6af05ff 100644 --- a/channels/contactrequestchannel_test.go +++ b/channels/contactrequestchannel_test.go @@ -2,9 +2,9 @@ package channels import ( "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/contact" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/contact" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/channels/handler.go b/channels/handler.go index ac21033..e56b629 100644 --- a/channels/handler.go +++ b/channels/handler.go @@ -1,7 +1,7 @@ package channels import ( - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" ) // Handler reacts to low-level events on a protocol channel. There diff --git a/channels/hiddenserviceauthchannel.go b/channels/hiddenserviceauthchannel.go index 498fd69..7cb74ab 100644 --- a/channels/hiddenserviceauthchannel.go +++ b/channels/hiddenserviceauthchannel.go @@ -8,10 +8,10 @@ import ( "crypto/sha256" "encoding/asn1" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/identity" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/auth" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/identity" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/auth" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "io" ) diff --git a/channels/hiddenserviceauthchannel_test.go b/channels/hiddenserviceauthchannel_test.go index 686f81a..c75c67b 100644 --- a/channels/hiddenserviceauthchannel_test.go +++ b/channels/hiddenserviceauthchannel_test.go @@ -4,9 +4,9 @@ import ( "bytes" "crypto/rsa" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/identity" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/identity" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/connection/authorizationmanager.go b/connection/authorizationmanager.go index 00576cc..024ab8e 100644 --- a/connection/authorizationmanager.go +++ b/connection/authorizationmanager.go @@ -1,7 +1,7 @@ package connection import ( - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" ) // AuthorizationManager helps keep track of permissions for a connection diff --git a/connection/autoconnectionhandler.go b/connection/autoconnectionhandler.go index 0407b85..7e2dc5e 100644 --- a/connection/autoconnectionhandler.go +++ b/connection/autoconnectionhandler.go @@ -1,8 +1,8 @@ package connection import ( - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" ) // AutoConnectionHandler implements the ConnectionHandler interface on behalf of diff --git a/connection/autoconnectionhandler_test.go b/connection/autoconnectionhandler_test.go index 41f8996..dfff85f 100644 --- a/connection/autoconnectionhandler_test.go +++ b/connection/autoconnectionhandler_test.go @@ -2,9 +2,9 @@ package connection import ( "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/connection/channelmanager.go b/connection/channelmanager.go index 3921e2c..035eac9 100644 --- a/connection/channelmanager.go +++ b/connection/channelmanager.go @@ -1,8 +1,8 @@ package connection import ( - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "sync" ) diff --git a/connection/channelmanager_test.go b/connection/channelmanager_test.go index 01da297..87ccb79 100644 --- a/connection/channelmanager_test.go +++ b/connection/channelmanager_test.go @@ -1,7 +1,7 @@ package connection import ( - "github.com/s-rah/go-ricochet/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" "testing" ) diff --git a/connection/connection.go b/connection/connection.go index a493f5c..29b8f1e 100644 --- a/connection/connection.go +++ b/connection/connection.go @@ -4,9 +4,9 @@ import ( "context" "fmt" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "io" "log" "sync" diff --git a/connection/connection_test.go b/connection/connection_test.go index 6151d36..02c1e06 100644 --- a/connection/connection_test.go +++ b/connection/connection_test.go @@ -2,8 +2,8 @@ package connection import ( "crypto/rsa" - "github.com/s-rah/go-ricochet/identity" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/identity" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "net" "testing" "time" diff --git a/connection/control_channel.go b/connection/control_channel.go index 29b2935..aaeae34 100644 --- a/connection/control_channel.go +++ b/connection/control_channel.go @@ -2,8 +2,8 @@ package connection import ( "errors" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" ) // ControlChannel encapsulates logic for the control channel processing diff --git a/connection/control_channel_test.go b/connection/control_channel_test.go index ca872a0..5b555b5 100644 --- a/connection/control_channel_test.go +++ b/connection/control_channel_test.go @@ -2,9 +2,9 @@ package connection import ( "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/utils" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/connection/handler.go b/connection/handler.go index 85f01f2..9a6c42b 100644 --- a/connection/handler.go +++ b/connection/handler.go @@ -1,7 +1,7 @@ package connection import ( - "github.com/s-rah/go-ricochet/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" ) // Handler reacts to low-level events on a protocol connection. diff --git a/connection/inboundconnectionhandler.go b/connection/inboundconnectionhandler.go index 0a5ddbc..f235dcc 100644 --- a/connection/inboundconnectionhandler.go +++ b/connection/inboundconnectionhandler.go @@ -2,10 +2,10 @@ package connection import ( "crypto/rsa" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/identity" - "github.com/s-rah/go-ricochet/policies" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/identity" + "git.openprivacy.ca/openprivacy/libricochet-go/policies" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "sync" ) diff --git a/connection/outboundconnectionhandler.go b/connection/outboundconnectionhandler.go index a84413e..d6b4876 100644 --- a/connection/outboundconnectionhandler.go +++ b/connection/outboundconnectionhandler.go @@ -1,10 +1,10 @@ package connection import ( - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/identity" - "github.com/s-rah/go-ricochet/policies" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/identity" + "git.openprivacy.ca/openprivacy/libricochet-go/policies" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "sync" ) diff --git a/examples/echobot/main.go b/examples/echobot/main.go index 0265047..3613a7b 100644 --- a/examples/echobot/main.go +++ b/examples/echobot/main.go @@ -1,11 +1,11 @@ package main import ( - "github.com/s-rah/go-ricochet" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/connection" - "github.com/s-rah/go-ricochet/identity" - "github.com/s-rah/go-ricochet/utils" + "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" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "log" "time" ) diff --git a/identity/identity.go b/identity/identity.go index a55050f..ff0ff67 100644 --- a/identity/identity.go +++ b/identity/identity.go @@ -4,7 +4,7 @@ import ( "crypto" "crypto/rsa" "encoding/asn1" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" ) // Identity is an encapsulation of Name, PrivateKey and other features diff --git a/inbound_version_negotiation_test.go b/inbound_version_negotiation_test.go index 8040d22..665cfc3 100644 --- a/inbound_version_negotiation_test.go +++ b/inbound_version_negotiation_test.go @@ -1,7 +1,7 @@ package goricochet import ( - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "io" "net" "testing" diff --git a/outbound_version_negotiation_test.go b/outbound_version_negotiation_test.go index 8ed1357..c71fbae 100644 --- a/outbound_version_negotiation_test.go +++ b/outbound_version_negotiation_test.go @@ -1,7 +1,7 @@ package goricochet import ( - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "net" "testing" "time" diff --git a/policies/timeoutpolicy.go b/policies/timeoutpolicy.go index f342575..f142b89 100644 --- a/policies/timeoutpolicy.go +++ b/policies/timeoutpolicy.go @@ -1,7 +1,7 @@ package policies import ( - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "time" ) diff --git a/ricochet.go b/ricochet.go index 1fd9547..ad9a269 100644 --- a/ricochet.go +++ b/ricochet.go @@ -1,8 +1,8 @@ package goricochet import ( - "github.com/s-rah/go-ricochet/connection" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/connection" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "io" "net" ) diff --git a/testing/integration_test.go b/testing/integration_test.go index cd5ec16..514449e 100644 --- a/testing/integration_test.go +++ b/testing/integration_test.go @@ -2,9 +2,9 @@ package testing import ( "fmt" - "github.com/s-rah/go-ricochet/application" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/application" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "log" "runtime" "strconv" diff --git a/utils/messagebuilder.go b/utils/messagebuilder.go index 9b932f1..ba35bc3 100644 --- a/utils/messagebuilder.go +++ b/utils/messagebuilder.go @@ -2,10 +2,10 @@ package utils import ( "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/wire/auth" - "github.com/s-rah/go-ricochet/wire/chat" - "github.com/s-rah/go-ricochet/wire/contact" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/auth" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/chat" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/contact" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" ) // MessageBuilder allows a client to construct specific data packets for the diff --git a/utils/messagebuilder_test.go b/utils/messagebuilder_test.go index 75c0947..0f930f9 100644 --- a/utils/messagebuilder_test.go +++ b/utils/messagebuilder_test.go @@ -2,7 +2,7 @@ package utils import ( "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/wire/auth/auth_message.go b/wire/auth/auth_message.go index 053abfe..e9b29b4 100644 --- a/wire/auth/auth_message.go +++ b/wire/auth/auth_message.go @@ -18,7 +18,7 @@ package Protocol_Data_AuthHiddenService import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import Protocol_Data_Control "github.com/s-rah/go-ricochet/wire/control" +import Protocol_Data_Control "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/wire/contact/request.go b/wire/contact/request.go index 1479913..8615490 100644 --- a/wire/contact/request.go +++ b/wire/contact/request.go @@ -17,7 +17,7 @@ package Protocol_Data_ContactRequest import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import Protocol_Data_Control "github.com/s-rah/go-ricochet/wire/control" +import Protocol_Data_Control "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal