diff --git a/model/group.go b/model/group.go index d8cb31a..6d48ed5 100644 --- a/model/group.go +++ b/model/group.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "golang.org/x/crypto/nacl/secretbox" "io" "sync" diff --git a/model/profile.go b/model/profile.go index c7e0e01..430b1e7 100644 --- a/model/profile.go +++ b/model/profile.go @@ -7,7 +7,7 @@ import ( "encoding/asn1" "errors" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "golang.org/x/crypto/ed25519" "io" "strconv" diff --git a/peer/connections/peerpeerconnection.go b/peer/connections/peerpeerconnection.go index 4eab248..94b2ad7 100644 --- a/peer/connections/peerpeerconnection.go +++ b/peer/connections/peerpeerconnection.go @@ -3,11 +3,10 @@ package connections import ( "cwtch.im/cwtch/peer/peer" "cwtch.im/cwtch/protocol" - "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" "cwtch.im/cwtch/model" "log" "time" diff --git a/peer/connections/peerpeerconnection_test.go b/peer/connections/peerpeerconnection_test.go index b20e7e4..c03226b 100644 --- a/peer/connections/peerpeerconnection_test.go +++ b/peer/connections/peerpeerconnection_test.go @@ -5,11 +5,11 @@ import ( "cwtch.im/cwtch/model" "cwtch.im/cwtch/peer/peer" "cwtch.im/cwtch/protocol" - "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" "net" "testing" "time" diff --git a/peer/connections/peerserverconnection.go b/peer/connections/peerserverconnection.go index 838cc5f..52d73e2 100644 --- a/peer/connections/peerserverconnection.go +++ b/peer/connections/peerserverconnection.go @@ -6,11 +6,11 @@ import ( "cwtch.im/cwtch/peer/send" "cwtch.im/cwtch/protocol" "errors" - "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/peer/connections/peerserverconnection_test.go b/peer/connections/peerserverconnection_test.go index 3ba691b..f665b3b 100644 --- a/peer/connections/peerserverconnection_test.go +++ b/peer/connections/peerserverconnection_test.go @@ -5,11 +5,11 @@ import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/server/fetch" "cwtch.im/cwtch/server/send" - "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" "net" "testing" "time" diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go index 22c1a5e..ff13e45 100644 --- a/peer/cwtch_peer.go +++ b/peer/cwtch_peer.go @@ -10,9 +10,9 @@ import ( "encoding/json" "errors" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/application" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/connection" + "git.openprivacy.ca/openprivacy/libricochet-go/application" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/connection" "golang.org/x/crypto/ed25519" "io/ioutil" "log" diff --git a/peer/fetch/peer_fetch_channel.go b/peer/fetch/peer_fetch_channel.go index 2b934be..faf0bd4 100644 --- a/peer/fetch/peer_fetch_channel.go +++ b/peer/fetch/peer_fetch_channel.go @@ -4,9 +4,9 @@ import ( "cwtch.im/cwtch/protocol" "errors" "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" ) // 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 0702053..d6269bd 100644 --- a/peer/fetch/peer_fetch_channel_test.go +++ b/peer/fetch/peer_fetch_channel_test.go @@ -3,8 +3,8 @@ package fetch import ( "cwtch.im/cwtch/protocol" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" "time" ) diff --git a/peer/listen/peer_listen_channel.go b/peer/listen/peer_listen_channel.go index d837f81..a688172 100644 --- a/peer/listen/peer_listen_channel.go +++ b/peer/listen/peer_listen_channel.go @@ -4,9 +4,9 @@ import ( "cwtch.im/cwtch/protocol" "errors" "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" ) // 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 f8f535b..2278369 100644 --- a/peer/listen/peer_listen_channel_test.go +++ b/peer/listen/peer_listen_channel_test.go @@ -3,8 +3,8 @@ package listen import ( "cwtch.im/cwtch/protocol" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" "time" ) diff --git a/peer/peer/peer_channel.go b/peer/peer/peer_channel.go index 17dadcc..0b75af5 100644 --- a/peer/peer/peer_channel.go +++ b/peer/peer/peer_channel.go @@ -3,9 +3,9 @@ package peer import ( "cwtch.im/cwtch/protocol" "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" "log" ) diff --git a/peer/peer/peer_channel_test.go b/peer/peer/peer_channel_test.go index 39fd428..2239f78 100644 --- a/peer/peer/peer_channel_test.go +++ b/peer/peer/peer_channel_test.go @@ -3,8 +3,8 @@ package peer import ( "cwtch.im/cwtch/protocol" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/peer/send/peer_send_channel.go b/peer/send/peer_send_channel.go index 538722b..6640fbe 100644 --- a/peer/send/peer_send_channel.go +++ b/peer/send/peer_send_channel.go @@ -5,9 +5,9 @@ import ( "cwtch.im/cwtch/protocol/spam" "errors" "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" ) // 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 dc0d81e..7309a81 100644 --- a/peer/send/peer_send_channel_test.go +++ b/peer/send/peer_send_channel_test.go @@ -4,8 +4,8 @@ import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/protocol/spam" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/protocol/group_message.pb.go b/protocol/group_message.pb.go index 6275df0..9aba374a 100644 --- a/protocol/group_message.pb.go +++ b/protocol/group_message.pb.go @@ -6,7 +6,7 @@ package protocol import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import control "github.com/s-rah/go-ricochet/wire/control" +import 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/protocol/spam/spamguard.go b/protocol/spam/spamguard.go index 45dcff2..36af560 100644 --- a/protocol/spam/spamguard.go +++ b/protocol/spam/spamguard.go @@ -5,8 +5,8 @@ import ( "crypto/sha256" "cwtch.im/cwtch/protocol" "github.com/golang/protobuf/proto" - "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" "io" //"fmt" ) diff --git a/protocol/spam/spamguard_test.go b/protocol/spam/spamguard_test.go index 19c4243..caa2234 100644 --- a/protocol/spam/spamguard_test.go +++ b/protocol/spam/spamguard_test.go @@ -3,7 +3,7 @@ package spam import ( "cwtch.im/cwtch/protocol" "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/server/fetch/server_fetch_channel.go b/server/fetch/server_fetch_channel.go index 1e4bf26..51e67ef 100644 --- a/server/fetch/server_fetch_channel.go +++ b/server/fetch/server_fetch_channel.go @@ -4,9 +4,9 @@ import ( "cwtch.im/cwtch/protocol" "errors" "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" ) // 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 e53747d..eb215ec 100644 --- a/server/fetch/server_fetch_channel_test.go +++ b/server/fetch/server_fetch_channel_test.go @@ -3,8 +3,8 @@ package fetch import ( "cwtch.im/cwtch/protocol" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/server/listen/server_listen_channel.go b/server/listen/server_listen_channel.go index 6926f35..d935306 100644 --- a/server/listen/server_listen_channel.go +++ b/server/listen/server_listen_channel.go @@ -4,9 +4,9 @@ import ( "cwtch.im/cwtch/protocol" "errors" "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" ) // 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 0652bca..9a5c7dd 100644 --- a/server/listen/server_listen_channel_test.go +++ b/server/listen/server_listen_channel_test.go @@ -3,8 +3,8 @@ package listen import ( "cwtch.im/cwtch/protocol" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/server/send/server_send_channel.go b/server/send/server_send_channel.go index 873091d..186c0e5 100644 --- a/server/send/server_send_channel.go +++ b/server/send/server_send_channel.go @@ -5,8 +5,8 @@ import ( "cwtch.im/cwtch/protocol/spam" "errors" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "log" ) diff --git a/server/send/server_send_channel_test.go b/server/send/server_send_channel_test.go index 0148857..7eb70f4 100644 --- a/server/send/server_send_channel_test.go +++ b/server/send/server_send_channel_test.go @@ -4,8 +4,8 @@ import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/protocol/spam" "github.com/golang/protobuf/proto" - "github.com/s-rah/go-ricochet/channels" - "github.com/s-rah/go-ricochet/wire/control" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/wire/control" "testing" ) diff --git a/server/server.go b/server/server.go index 225c403..d79dd02 100644 --- a/server/server.go +++ b/server/server.go @@ -5,8 +5,8 @@ import ( "cwtch.im/cwtch/server/listen" "cwtch.im/cwtch/server/send" "cwtch.im/cwtch/storage" - "github.com/s-rah/go-ricochet/application" - "github.com/s-rah/go-ricochet/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/application" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" "log" ) diff --git a/server/serverConfig.go b/server/serverConfig.go index acbf619..fdfb632 100644 --- a/server/serverConfig.go +++ b/server/serverConfig.go @@ -3,7 +3,7 @@ package server import ( "crypto/rsa" "encoding/json" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "io/ioutil" "log" "sync" diff --git a/server/server_instance.go b/server/server_instance.go index 07d0e33..851668c 100644 --- a/server/server_instance.go +++ b/server/server_instance.go @@ -4,8 +4,8 @@ import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/server/listen" "cwtch.im/cwtch/storage" - "github.com/s-rah/go-ricochet/application" - "github.com/s-rah/go-ricochet/channels" + "git.openprivacy.ca/openprivacy/libricochet-go/application" + "git.openprivacy.ca/openprivacy/libricochet-go/channels" ) // Instance encapsulates the Ricochet application. diff --git a/server/server_instance_test.go b/server/server_instance_test.go index 99671c0..088fdb1 100644 --- a/server/server_instance_test.go +++ b/server/server_instance_test.go @@ -3,7 +3,7 @@ package server import ( "cwtch.im/cwtch/protocol" "cwtch.im/cwtch/storage" - "github.com/s-rah/go-ricochet/application" + "git.openprivacy.ca/openprivacy/libricochet-go/application" "os" "testing" "time" diff --git a/testing/cwtch_peer_server_intergration_test.go b/testing/cwtch_peer_server_intergration_test.go index 08db1cb..c8634a0 100644 --- a/testing/cwtch_peer_server_intergration_test.go +++ b/testing/cwtch_peer_server_intergration_test.go @@ -7,7 +7,7 @@ import ( "cwtch.im/cwtch/peer/connections" cwtchserver "cwtch.im/cwtch/server" "fmt" - "github.com/s-rah/go-ricochet/utils" + "git.openprivacy.ca/openprivacy/libricochet-go/utils" "golang.org/x/net/proxy" "io/ioutil" "log"