diff --git a/cmd/syncv3/main.go b/cmd/syncv3/main.go index d9d9ff0..b0dd1d0 100644 --- a/cmd/syncv3/main.go +++ b/cmd/syncv3/main.go @@ -7,8 +7,8 @@ import ( "os" "strings" - syncv3 "github.com/matrix-org/sync-v3" - "github.com/matrix-org/sync-v3/sync2" + syncv3 "github.com/matrix-org/sliding-sync" + "github.com/matrix-org/sliding-sync/sync2" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/go.mod b/go.mod index 09697d3..d557e3e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/matrix-org/sync-v3 +module github.com/matrix-org/sliding-sync go 1.14 diff --git a/pubsub/v2.go b/pubsub/v2.go index 5451e75..2291cc0 100644 --- a/pubsub/v2.go +++ b/pubsub/v2.go @@ -3,7 +3,7 @@ package pubsub import ( "encoding/json" - "github.com/matrix-org/sync-v3/internal" + "github.com/matrix-org/sliding-sync/internal" ) // The channel which has V2* payloads diff --git a/state/account_data.go b/state/account_data.go index e714447..c154e1b 100644 --- a/state/account_data.go +++ b/state/account_data.go @@ -5,7 +5,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/lib/pq" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/sqlutil" ) const AccountDataGlobalRoom = "" diff --git a/state/account_data_test.go b/state/account_data_test.go index 6f184b9..de5eb33 100644 --- a/state/account_data_test.go +++ b/state/account_data_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/jmoiron/sqlx" - "github.com/matrix-org/sync-v3/sync2" + "github.com/matrix-org/sliding-sync/sync2" ) func accountDatasEqual(gots, wants []AccountData) bool { diff --git a/state/accumulator.go b/state/accumulator.go index 5083213..81472e1 100644 --- a/state/accumulator.go +++ b/state/accumulator.go @@ -8,7 +8,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/lib/pq" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/sqlutil" "github.com/rs/zerolog" "github.com/tidwall/gjson" ) diff --git a/state/accumulator_test.go b/state/accumulator_test.go index eea4a10..8af9345 100644 --- a/state/accumulator_test.go +++ b/state/accumulator_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/jmoiron/sqlx" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/testutils" "github.com/tidwall/gjson" ) diff --git a/state/device_data_table.go b/state/device_data_table.go index a414289..4c26ee6 100644 --- a/state/device_data_table.go +++ b/state/device_data_table.go @@ -5,8 +5,8 @@ import ( "encoding/json" "github.com/jmoiron/sqlx" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sqlutil" ) type DeviceDataRow struct { diff --git a/state/device_data_table_test.go b/state/device_data_table_test.go index 4d046c4..35e8579 100644 --- a/state/device_data_table_test.go +++ b/state/device_data_table_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/jmoiron/sqlx" - "github.com/matrix-org/sync-v3/internal" + "github.com/matrix-org/sliding-sync/internal" ) func assertVal(t *testing.T, msg string, got, want interface{}) { diff --git a/state/event_table.go b/state/event_table.go index cb75ac6..6936714 100644 --- a/state/event_table.go +++ b/state/event_table.go @@ -10,8 +10,8 @@ import ( "github.com/tidwall/gjson" "github.com/tidwall/sjson" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sqlutil" ) const ( diff --git a/state/event_table_test.go b/state/event_table_test.go index 74ee1a2..9a0781a 100644 --- a/state/event_table_test.go +++ b/state/event_table_test.go @@ -9,8 +9,8 @@ import ( "github.com/jmoiron/sqlx" "github.com/tidwall/gjson" - "github.com/matrix-org/sync-v3/sqlutil" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/sqlutil" + "github.com/matrix-org/sliding-sync/testutils" ) func TestEventTable(t *testing.T) { diff --git a/state/main_test.go b/state/main_test.go index 98081d4..4727bbe 100644 --- a/state/main_test.go +++ b/state/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/testutils" ) var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable" diff --git a/state/receipt_table.go b/state/receipt_table.go index 2c32af9..6867722 100644 --- a/state/receipt_table.go +++ b/state/receipt_table.go @@ -6,8 +6,8 @@ import ( "github.com/jmoiron/sqlx" "github.com/lib/pq" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sqlutil" ) type receiptEDU struct { diff --git a/state/receipt_table_test.go b/state/receipt_table_test.go index caee3f7..e9d8ab6 100644 --- a/state/receipt_table_test.go +++ b/state/receipt_table_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/jmoiron/sqlx" - "github.com/matrix-org/sync-v3/internal" + "github.com/matrix-org/sliding-sync/internal" ) func sortReceipts(receipts []internal.Receipt) { diff --git a/state/spaces_table.go b/state/spaces_table.go index 1ff04a2..d654137 100644 --- a/state/spaces_table.go +++ b/state/spaces_table.go @@ -5,7 +5,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/lib/pq" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/sqlutil" "github.com/tidwall/gjson" ) diff --git a/state/storage.go b/state/storage.go index 81b3f27..cf0f8b5 100644 --- a/state/storage.go +++ b/state/storage.go @@ -11,8 +11,8 @@ import ( "github.com/jmoiron/sqlx" "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sqlutil" "github.com/rs/zerolog" "github.com/tidwall/gjson" ) diff --git a/state/storage_test.go b/state/storage_test.go index 35622e4..43f4620 100644 --- a/state/storage_test.go +++ b/state/storage_test.go @@ -10,9 +10,9 @@ import ( "github.com/jmoiron/sqlx" "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sqlutil" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sqlutil" + "github.com/matrix-org/sliding-sync/testutils" "github.com/tidwall/gjson" ) diff --git a/state/to_device_table.go b/state/to_device_table.go index 885ebbb..3323f60 100644 --- a/state/to_device_table.go +++ b/state/to_device_table.go @@ -7,7 +7,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/lib/pq" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/sqlutil" "github.com/tidwall/gjson" ) diff --git a/sync2/handler2/handler.go b/sync2/handler2/handler.go index 564b7ad..0632c3f 100644 --- a/sync2/handler2/handler.go +++ b/sync2/handler2/handler.go @@ -5,10 +5,10 @@ import ( "os" "sync" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/pubsub" - "github.com/matrix-org/sync-v3/state" - "github.com/matrix-org/sync-v3/sync2" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/pubsub" + "github.com/matrix-org/sliding-sync/state" + "github.com/matrix-org/sliding-sync/sync2" "github.com/prometheus/client_golang/prometheus" "github.com/rs/zerolog" "github.com/tidwall/gjson" diff --git a/sync2/poller.go b/sync2/poller.go index c40a513..136b112 100644 --- a/sync2/poller.go +++ b/sync2/poller.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/matrix-org/sync-v3/internal" + "github.com/matrix-org/sliding-sync/internal" "github.com/prometheus/client_golang/prometheus" "github.com/rs/zerolog" "github.com/tidwall/gjson" diff --git a/sync2/storage.go b/sync2/storage.go index 6c45f45..f5d51ee 100644 --- a/sync2/storage.go +++ b/sync2/storage.go @@ -13,7 +13,7 @@ import ( "github.com/jmoiron/sqlx" _ "github.com/lib/pq" - "github.com/matrix-org/sync-v3/sqlutil" + "github.com/matrix-org/sliding-sync/sqlutil" "github.com/rs/zerolog" ) diff --git a/sync2/storage_test.go b/sync2/storage_test.go index 344d158..8558074 100644 --- a/sync2/storage_test.go +++ b/sync2/storage_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/testutils" ) var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable" diff --git a/sync3/caches/global.go b/sync3/caches/global.go index db863cc..6e7bbcc 100644 --- a/sync3/caches/global.go +++ b/sync3/caches/global.go @@ -8,8 +8,8 @@ import ( "sync" "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/state" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/state" "github.com/rs/zerolog" "github.com/tidwall/gjson" ) diff --git a/sync3/caches/global_test.go b/sync3/caches/global_test.go index 453796c..93a7722 100644 --- a/sync3/caches/global_test.go +++ b/sync3/caches/global_test.go @@ -6,10 +6,10 @@ import ( "encoding/json" "testing" - "github.com/matrix-org/sync-v3/state" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/caches" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/state" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/caches" + "github.com/matrix-org/sliding-sync/testutils" ) func TestGlobalCacheLoadState(t *testing.T) { diff --git a/sync3/caches/main_test.go b/sync3/caches/main_test.go index 45a390f..f35dc93 100644 --- a/sync3/caches/main_test.go +++ b/sync3/caches/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/testutils" ) var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable" diff --git a/sync3/caches/update.go b/sync3/caches/update.go index 62b8968..bac3620 100644 --- a/sync3/caches/update.go +++ b/sync3/caches/update.go @@ -3,8 +3,8 @@ package caches import ( "encoding/json" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/state" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/state" ) type Update interface { diff --git a/sync3/caches/user.go b/sync3/caches/user.go index b3cd326..330188c 100644 --- a/sync3/caches/user.go +++ b/sync3/caches/user.go @@ -6,9 +6,9 @@ import ( "sync" lru "github.com/hashicorp/golang-lru" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/state" - "github.com/matrix-org/sync-v3/sync2" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/state" + "github.com/matrix-org/sliding-sync/sync2" "github.com/tidwall/gjson" "github.com/tidwall/sjson" ) diff --git a/sync3/conn.go b/sync3/conn.go index c7d3c73..4fde6d1 100644 --- a/sync3/conn.go +++ b/sync3/conn.go @@ -6,7 +6,7 @@ import ( "runtime/debug" "sync" - "github.com/matrix-org/sync-v3/internal" + "github.com/matrix-org/sliding-sync/internal" ) type ConnID struct { diff --git a/sync3/conn_test.go b/sync3/conn_test.go index f93abf2..b987e5f 100644 --- a/sync3/conn_test.go +++ b/sync3/conn_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/internal" + "github.com/matrix-org/sliding-sync/internal" ) type connHandlerMock struct { diff --git a/sync3/dispatcher.go b/sync3/dispatcher.go index bc4586e..4910262 100644 --- a/sync3/dispatcher.go +++ b/sync3/dispatcher.go @@ -5,7 +5,7 @@ import ( "os" "sync" - "github.com/matrix-org/sync-v3/sync3/caches" + "github.com/matrix-org/sliding-sync/sync3/caches" "github.com/rs/zerolog" "github.com/tidwall/gjson" ) diff --git a/sync3/extensions/account_data.go b/sync3/extensions/account_data.go index 34ba133..20f3119 100644 --- a/sync3/extensions/account_data.go +++ b/sync3/extensions/account_data.go @@ -3,8 +3,8 @@ package extensions import ( "encoding/json" - "github.com/matrix-org/sync-v3/state" - "github.com/matrix-org/sync-v3/sync3/caches" + "github.com/matrix-org/sliding-sync/state" + "github.com/matrix-org/sliding-sync/sync3/caches" ) // Client created request params diff --git a/sync3/extensions/e2ee.go b/sync3/extensions/e2ee.go index b9711e5..cec182d 100644 --- a/sync3/extensions/e2ee.go +++ b/sync3/extensions/e2ee.go @@ -1,8 +1,8 @@ package extensions import ( - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sync2" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sync2" ) // Client created request params diff --git a/sync3/extensions/extensions.go b/sync3/extensions/extensions.go index 56964f7..a533c29 100644 --- a/sync3/extensions/extensions.go +++ b/sync3/extensions/extensions.go @@ -3,9 +3,9 @@ package extensions import ( "os" - "github.com/matrix-org/sync-v3/state" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3/caches" + "github.com/matrix-org/sliding-sync/state" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3/caches" "github.com/rs/zerolog" ) diff --git a/sync3/extensions/receipts.go b/sync3/extensions/receipts.go index ef78153..c108f88 100644 --- a/sync3/extensions/receipts.go +++ b/sync3/extensions/receipts.go @@ -3,8 +3,8 @@ package extensions import ( "encoding/json" - "github.com/matrix-org/sync-v3/state" - "github.com/matrix-org/sync-v3/sync3/caches" + "github.com/matrix-org/sliding-sync/state" + "github.com/matrix-org/sliding-sync/sync3/caches" ) // Client created request params diff --git a/sync3/extensions/todevice.go b/sync3/extensions/todevice.go index 9cceef5..743748c 100644 --- a/sync3/extensions/todevice.go +++ b/sync3/extensions/todevice.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "github.com/matrix-org/sync-v3/state" + "github.com/matrix-org/sliding-sync/state" ) // Client created request params diff --git a/sync3/extensions/typing.go b/sync3/extensions/typing.go index 784b931..3037757 100644 --- a/sync3/extensions/typing.go +++ b/sync3/extensions/typing.go @@ -3,7 +3,7 @@ package extensions import ( "encoding/json" - "github.com/matrix-org/sync-v3/sync3/caches" + "github.com/matrix-org/sliding-sync/sync3/caches" ) // Client created request params diff --git a/sync3/handler/connstate.go b/sync3/handler/connstate.go index 87c350f..8ab51b2 100644 --- a/sync3/handler/connstate.go +++ b/sync3/handler/connstate.go @@ -6,10 +6,10 @@ import ( "runtime/trace" "time" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/caches" - "github.com/matrix-org/sync-v3/sync3/extensions" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/caches" + "github.com/matrix-org/sliding-sync/sync3/extensions" "github.com/prometheus/client_golang/prometheus" "github.com/tidwall/gjson" ) diff --git a/sync3/handler/connstate_live.go b/sync3/handler/connstate_live.go index a53ab80..506f881 100644 --- a/sync3/handler/connstate_live.go +++ b/sync3/handler/connstate_live.go @@ -6,10 +6,10 @@ import ( "runtime/trace" "time" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/caches" - "github.com/matrix-org/sync-v3/sync3/extensions" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/caches" + "github.com/matrix-org/sliding-sync/sync3/extensions" ) var ( diff --git a/sync3/handler/connstate_test.go b/sync3/handler/connstate_test.go index 1382d9f..aa1e115 100644 --- a/sync3/handler/connstate_test.go +++ b/sync3/handler/connstate_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/caches" - "github.com/matrix-org/sync-v3/sync3/extensions" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/caches" + "github.com/matrix-org/sliding-sync/sync3/extensions" + "github.com/matrix-org/sliding-sync/testutils" ) type NopExtensionHandler struct{} @@ -407,7 +407,7 @@ func TestConnStateMultipleRanges(t *testing.T) { }) } -// Regression test for https://github.com/matrix-org/sync-v3/commit/732ea46f1ccde2b6a382e0f849bbd166b80900ed +// Regression test func TestBumpToOutsideRange(t *testing.T) { ConnID := sync3.ConnID{ DeviceID: "d", diff --git a/sync3/handler/ensure_polling.go b/sync3/handler/ensure_polling.go index 270f48f..9316d00 100644 --- a/sync3/handler/ensure_polling.go +++ b/sync3/handler/ensure_polling.go @@ -3,7 +3,7 @@ package handler import ( "sync" - "github.com/matrix-org/sync-v3/pubsub" + "github.com/matrix-org/sliding-sync/pubsub" ) type pendingInfo struct { diff --git a/sync3/handler/handler.go b/sync3/handler/handler.go index e24898d..b4ecd57 100644 --- a/sync3/handler/handler.go +++ b/sync3/handler/handler.go @@ -11,13 +11,13 @@ import ( "sync" "time" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/pubsub" - "github.com/matrix-org/sync-v3/state" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/caches" - "github.com/matrix-org/sync-v3/sync3/extensions" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/pubsub" + "github.com/matrix-org/sliding-sync/state" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/caches" + "github.com/matrix-org/sliding-sync/sync3/extensions" "github.com/prometheus/client_golang/prometheus" "github.com/rs/zerolog" "github.com/rs/zerolog/hlog" diff --git a/sync3/handler/rooms_builder.go b/sync3/handler/rooms_builder.go index 7b4c1e3..75552bd 100644 --- a/sync3/handler/rooms_builder.go +++ b/sync3/handler/rooms_builder.go @@ -4,8 +4,8 @@ import ( "fmt" "sort" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sync3" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sync3" ) // RoomsBuilder gradually accumulates and mixes data required in order to populate the top-level rooms key diff --git a/sync3/handler/rooms_builder_test.go b/sync3/handler/rooms_builder_test.go index 463c2f5..f397e62 100644 --- a/sync3/handler/rooms_builder_test.go +++ b/sync3/handler/rooms_builder_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/matrix-org/sync-v3/sync3" + "github.com/matrix-org/sliding-sync/sync3" ) func TestRoomsBuilder(t *testing.T) { diff --git a/sync3/lists.go b/sync3/lists.go index 7349beb..b4248f3 100644 --- a/sync3/lists.go +++ b/sync3/lists.go @@ -3,7 +3,7 @@ package sync3 import ( "strings" - "github.com/matrix-org/sync-v3/internal" + "github.com/matrix-org/sliding-sync/internal" ) type OverwriteVal bool diff --git a/sync3/main_test.go b/sync3/main_test.go index 2849c9d..9638346 100644 --- a/sync3/main_test.go +++ b/sync3/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/testutils" "github.com/rs/zerolog" ) diff --git a/sync3/ops_test.go b/sync3/ops_test.go index ad4cf27..49de8de 100644 --- a/sync3/ops_test.go +++ b/sync3/ops_test.go @@ -6,7 +6,7 @@ import ( "math/rand" "testing" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/testutils" ) func TestCalculateListOps_BasicOperations(t *testing.T) { diff --git a/sync3/request.go b/sync3/request.go index e83be77..efd4228 100644 --- a/sync3/request.go +++ b/sync3/request.go @@ -5,8 +5,8 @@ import ( "encoding/json" "strings" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sync3/extensions" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sync3/extensions" ) var ( diff --git a/sync3/response.go b/sync3/response.go index 1e1e598..87ded8e 100644 --- a/sync3/response.go +++ b/sync3/response.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strconv" - "github.com/matrix-org/sync-v3/sync3/extensions" + "github.com/matrix-org/sliding-sync/sync3/extensions" "github.com/tidwall/gjson" ) diff --git a/sync3/room.go b/sync3/room.go index 327ee43..e539950 100644 --- a/sync3/room.go +++ b/sync3/room.go @@ -3,8 +3,8 @@ package sync3 import ( "encoding/json" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sync3/caches" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sync3/caches" ) type Room struct { diff --git a/sync3/sort.go b/sync3/sort.go index c17d84a..a68b421 100644 --- a/sync3/sort.go +++ b/sync3/sort.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/matrix-org/sync-v3/internal" + "github.com/matrix-org/sliding-sync/internal" ) type RoomFinder interface { diff --git a/sync3/sort_test.go b/sync3/sort_test.go index 3c06bd3..a62076d 100644 --- a/sync3/sort_test.go +++ b/sync3/sort_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/sync3/caches" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/sync3/caches" ) type finder struct { diff --git a/tests-e2e/client_test.go b/tests-e2e/client_test.go index b1e0140..48f194e 100644 --- a/tests-e2e/client_test.go +++ b/tests-e2e/client_test.go @@ -19,7 +19,7 @@ import ( "time" "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/sync-v3/sync3" + "github.com/matrix-org/sliding-sync/sync3" "github.com/tidwall/gjson" ) diff --git a/tests-e2e/lazy_loading_test.go b/tests-e2e/lazy_loading_test.go index 01fcc6d..552bdbe 100644 --- a/tests-e2e/lazy_loading_test.go +++ b/tests-e2e/lazy_loading_test.go @@ -3,8 +3,8 @@ package syncv3_test import ( "testing" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils/m" ) func TestLazyLoading(t *testing.T) { diff --git a/tests-e2e/lists_test.go b/tests-e2e/lists_test.go index af2ce74..4294059 100644 --- a/tests-e2e/lists_test.go +++ b/tests-e2e/lists_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils/m" ) // Test that multiple lists can be independently scrolled through diff --git a/tests-e2e/main_test.go b/tests-e2e/main_test.go index 79661b0..601bf67 100644 --- a/tests-e2e/main_test.go +++ b/tests-e2e/main_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils/m" ) var ( diff --git a/tests-e2e/membership_transitions_test.go b/tests-e2e/membership_transitions_test.go index 939d91a..f8f5485 100644 --- a/tests-e2e/membership_transitions_test.go +++ b/tests-e2e/membership_transitions_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils/m" ) func TestRoomStateTransitions(t *testing.T) { diff --git a/tests-e2e/num_live_test.go b/tests-e2e/num_live_test.go index adef757..5be5659 100644 --- a/tests-e2e/num_live_test.go +++ b/tests-e2e/num_live_test.go @@ -3,8 +3,8 @@ package syncv3_test import ( "testing" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils/m" ) func TestNumLive(t *testing.T) { diff --git a/tests-e2e/prev_batch_test.go b/tests-e2e/prev_batch_test.go index c6fb5c3..bc50739 100644 --- a/tests-e2e/prev_batch_test.go +++ b/tests-e2e/prev_batch_test.go @@ -6,7 +6,7 @@ import ( "net/url" "testing" - "github.com/matrix-org/sync-v3/sync3" + "github.com/matrix-org/sliding-sync/sync3" ) func TestPrevBatch(t *testing.T) { diff --git a/tests-e2e/receipts_test.go b/tests-e2e/receipts_test.go index 55f2092..0b5aa44 100644 --- a/tests-e2e/receipts_test.go +++ b/tests-e2e/receipts_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/extensions" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/extensions" + "github.com/matrix-org/sliding-sync/testutils/m" ) // Test that receipts are sent initially and during live streams diff --git a/tests-e2e/security_test.go b/tests-e2e/security_test.go index 09527cb..b5e91b2 100644 --- a/tests-e2e/security_test.go +++ b/tests-e2e/security_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils/m" ) // The purpose of these tests is to ensure that events for one user cannot leak to another user. diff --git a/tests-e2e/spaces_test.go b/tests-e2e/spaces_test.go index 13f0513..ad7930c 100644 --- a/tests-e2e/spaces_test.go +++ b/tests-e2e/spaces_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils/m" ) // Make this graph: diff --git a/tests-e2e/to_device_test.go b/tests-e2e/to_device_test.go index 4c0b216..f7bfd88 100644 --- a/tests-e2e/to_device_test.go +++ b/tests-e2e/to_device_test.go @@ -8,8 +8,8 @@ import ( "github.com/matrix-org/util" "github.com/tidwall/gjson" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/extensions" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/extensions" ) // Test that if you login to an account -> send a to-device message to this device -> initial proxy connection diff --git a/tests-e2e/tombstone_test.go b/tests-e2e/tombstone_test.go index efd0861..6732c78 100644 --- a/tests-e2e/tombstone_test.go +++ b/tests-e2e/tombstone_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils/m" "github.com/tidwall/gjson" ) diff --git a/tests-e2e/typing_test.go b/tests-e2e/typing_test.go index cc711de..a2196eb 100644 --- a/tests-e2e/typing_test.go +++ b/tests-e2e/typing_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/extensions" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/extensions" + "github.com/matrix-org/sliding-sync/testutils/m" "github.com/tidwall/gjson" ) diff --git a/tests-integration/bench_test.go b/tests-integration/bench_test.go index 241479a..f4d848a 100644 --- a/tests-integration/bench_test.go +++ b/tests-integration/bench_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" "github.com/rs/zerolog" ) diff --git a/tests-integration/connection_test.go b/tests-integration/connection_test.go index 66dfa23..4eda928 100644 --- a/tests-integration/connection_test.go +++ b/tests-integration/connection_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" "github.com/tidwall/gjson" ) diff --git a/tests-integration/extensions_test.go b/tests-integration/extensions_test.go index a102dce..5b5cab4 100644 --- a/tests-integration/extensions_test.go +++ b/tests-integration/extensions_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/extensions" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/extensions" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" ) var valTrue = true diff --git a/tests-integration/filters_test.go b/tests-integration/filters_test.go index 0fd4ff0..a91068b 100644 --- a/tests-integration/filters_test.go +++ b/tests-integration/filters_test.go @@ -4,10 +4,10 @@ import ( "encoding/json" "testing" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" ) // Test that filters work initially and whilst streamed. diff --git a/tests-integration/invite_test.go b/tests-integration/invite_test.go index 9bad0e0..af5baf1 100644 --- a/tests-integration/invite_test.go +++ b/tests-integration/invite_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" ) func TestStuckInvites(t *testing.T) { diff --git a/tests-integration/metrics_test.go b/tests-integration/metrics_test.go index daaac42..df07ba0 100644 --- a/tests-integration/metrics_test.go +++ b/tests-integration/metrics_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/tests-integration/notifications_test.go b/tests-integration/notifications_test.go index b56e1f3..47118cc 100644 --- a/tests-integration/notifications_test.go +++ b/tests-integration/notifications_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" ) // Test that sort operations that favour notif counts always appear at the start of the list. diff --git a/tests-integration/rig_test.go b/tests-integration/rig_test.go index ea2b05f..f1104f7 100644 --- a/tests-integration/rig_test.go +++ b/tests-integration/rig_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" ) type FlushEnum int diff --git a/tests-integration/room_names_test.go b/tests-integration/room_names_test.go index 87098cf..d8936da 100644 --- a/tests-integration/room_names_test.go +++ b/tests-integration/room_names_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" ) // Test that room names come through sanely. Additional testing to ensure we copy hero slices correctly. diff --git a/tests-integration/room_subscriptions_test.go b/tests-integration/room_subscriptions_test.go index 176cdc3..9ca6c88 100644 --- a/tests-integration/room_subscriptions_test.go +++ b/tests-integration/room_subscriptions_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" ) // Test that if you /join a room and then immediately add a room subscription for said room before the diff --git a/tests-integration/slow_get_all_rooms_test.go b/tests-integration/slow_get_all_rooms_test.go index cdb09fe..6208a1b 100644 --- a/tests-integration/slow_get_all_rooms_test.go +++ b/tests-integration/slow_get_all_rooms_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" ) // - Test that you can get all rooms initially for a list diff --git a/tests-integration/timeline_test.go b/tests-integration/timeline_test.go index c127873..38a32f8 100644 --- a/tests-integration/timeline_test.go +++ b/tests-integration/timeline_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" "github.com/tidwall/sjson" ) diff --git a/tests-integration/v3_test.go b/tests-integration/v3_test.go index 0990c84..7cb5cf1 100644 --- a/tests-integration/v3_test.go +++ b/tests-integration/v3_test.go @@ -17,13 +17,13 @@ import ( "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" - syncv3 "github.com/matrix-org/sync-v3" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync2/handler2" - "github.com/matrix-org/sync-v3/sync3" - "github.com/matrix-org/sync-v3/sync3/handler" - "github.com/matrix-org/sync-v3/testutils" - "github.com/matrix-org/sync-v3/testutils/m" + syncv3 "github.com/matrix-org/sliding-sync" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync2/handler2" + "github.com/matrix-org/sliding-sync/sync3" + "github.com/matrix-org/sliding-sync/sync3/handler" + "github.com/matrix-org/sliding-sync/testutils" + "github.com/matrix-org/sliding-sync/testutils/m" "github.com/tidwall/gjson" ) diff --git a/testutils/m/match.go b/testutils/m/match.go index 2d08298..78d8f15 100644 --- a/testutils/m/match.go +++ b/testutils/m/match.go @@ -8,7 +8,7 @@ import ( "sort" "testing" - "github.com/matrix-org/sync-v3/sync3" + "github.com/matrix-org/sliding-sync/sync3" "github.com/tidwall/gjson" ) diff --git a/v3.go b/v3.go index bbf784a..089c3d1 100644 --- a/v3.go +++ b/v3.go @@ -1,4 +1,4 @@ -package syncv3 +package slidingsync import ( "encoding/json" @@ -9,12 +9,12 @@ import ( "time" "github.com/gorilla/mux" - "github.com/matrix-org/sync-v3/internal" - "github.com/matrix-org/sync-v3/pubsub" - "github.com/matrix-org/sync-v3/state" - "github.com/matrix-org/sync-v3/sync2" - "github.com/matrix-org/sync-v3/sync2/handler2" - "github.com/matrix-org/sync-v3/sync3/handler" + "github.com/matrix-org/sliding-sync/internal" + "github.com/matrix-org/sliding-sync/pubsub" + "github.com/matrix-org/sliding-sync/state" + "github.com/matrix-org/sliding-sync/sync2" + "github.com/matrix-org/sliding-sync/sync2/handler2" + "github.com/matrix-org/sliding-sync/sync3/handler" "github.com/rs/zerolog" "github.com/rs/zerolog/hlog" )