go/sliding-sync
go/sliding-sync
1
0
Fork 0
mirror of https://github.com/matrix-org/sliding-sync.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename package -> github.com/matrix-org/sliding-sync

Browse Source
This commit is contained in:
Kegan Dougal 2022-12-15 11:08:50 +00:00
parent beeb128be0
commit aa28df161c
79 changed files with 183 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/syncv3/main.go
View File

@ -7,8 +7,8 @@ import (
"os" "os"
"strings" "strings"
syncv3 "github.com/matrix-org/sync-v3" syncv3 "github.com/matrix-org/sliding-sync"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
) )

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/matrix-org/sync-v3 module github.com/matrix-org/sliding-sync
go 1.14 go 1.14

2
pubsub/v2.go
View File

@ -3,7 +3,7 @@ package pubsub
import ( import (
"encoding/json" "encoding/json"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
) )
// The channel which has V2* payloads // The channel which has V2* payloads

2
state/account_data.go
View File

@ -5,7 +5,7 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/lib/pq" "github.com/lib/pq"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
) )
const AccountDataGlobalRoom = "" const AccountDataGlobalRoom = ""

2
state/account_data_test.go
View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
) )
func accountDatasEqual(gots, wants []AccountData) bool { func accountDatasEqual(gots, wants []AccountData) bool {

2
state/accumulator.go
View File

@ -8,7 +8,7 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/lib/pq" "github.com/lib/pq"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

4
state/accumulator_test.go
View File

@ -8,8 +8,8 @@ import (
"testing" "testing"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

4
state/device_data_table.go
View File

@ -5,8 +5,8 @@ import (
"encoding/json" "encoding/json"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
) )
type DeviceDataRow struct { type DeviceDataRow struct {

2
state/device_data_table_test.go
View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"github.com/jmoiron/sqlx" "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{}) { func assertVal(t *testing.T, msg string, got, want interface{}) {

4
state/event_table.go
View File

@ -10,8 +10,8 @@ import (
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"github.com/tidwall/sjson" "github.com/tidwall/sjson"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
) )
const ( const (

4
state/event_table_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
) )
func TestEventTable(t *testing.T) { func TestEventTable(t *testing.T) {

2
state/main_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
) )
var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable" var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable"

4
state/receipt_table.go
View File

@ -6,8 +6,8 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/lib/pq" "github.com/lib/pq"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
) )
type receiptEDU struct { type receiptEDU struct {

2
state/receipt_table_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
) )
func sortReceipts(receipts []internal.Receipt) { func sortReceipts(receipts []internal.Receipt) {

2
state/spaces_table.go
View File

@ -5,7 +5,7 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/lib/pq" "github.com/lib/pq"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

4
state/storage.go
View File

@ -11,8 +11,8 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/lib/pq" "github.com/lib/pq"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

6
state/storage_test.go
View File

@ -10,9 +10,9 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

2
state/to_device_table.go
View File

@ -7,7 +7,7 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/lib/pq" "github.com/lib/pq"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

8
sync2/handler2/handler.go
View File

@ -5,10 +5,10 @@ import (
"os" "os"
"sync" "sync"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/pubsub" "github.com/matrix-org/sliding-sync/pubsub"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"

2
sync2/poller.go
View File

@ -6,7 +6,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"

2
sync2/storage.go
View File

@ -13,7 +13,7 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"github.com/matrix-org/sync-v3/sqlutil" "github.com/matrix-org/sliding-sync/sqlutil"
"github.com/rs/zerolog" "github.com/rs/zerolog"
) )

2
sync2/storage_test.go
View File

@ -5,7 +5,7 @@ import (
"sort" "sort"
"testing" "testing"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
) )
var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable" var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable"

4
sync3/caches/global.go
View File

@ -8,8 +8,8 @@ import (
"sync" "sync"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

8
sync3/caches/global_test.go
View File

@ -6,10 +6,10 @@ import (
"encoding/json" "encoding/json"
"testing" "testing"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
) )
func TestGlobalCacheLoadState(t *testing.T) { func TestGlobalCacheLoadState(t *testing.T) {

2
sync3/caches/main_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
) )
var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable" var postgresConnectionString = "user=xxxxx dbname=syncv3_test sslmode=disable"

4
sync3/caches/update.go
View File

@ -3,8 +3,8 @@ package caches
import ( import (
"encoding/json" "encoding/json"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
) )
type Update interface { type Update interface {

6
sync3/caches/user.go
View File

@ -6,9 +6,9 @@ import (
"sync" "sync"
lru "github.com/hashicorp/golang-lru" lru "github.com/hashicorp/golang-lru"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"github.com/tidwall/sjson" "github.com/tidwall/sjson"
) )

2
sync3/conn.go
View File

@ -6,7 +6,7 @@ import (
"runtime/debug" "runtime/debug"
"sync" "sync"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
) )
type ConnID struct { type ConnID struct {

2
sync3/conn_test.go
View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
) )
type connHandlerMock struct { type connHandlerMock struct {

2
sync3/dispatcher.go
View File

@ -5,7 +5,7 @@ import (
"os" "os"
"sync" "sync"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

4
sync3/extensions/account_data.go
View File

@ -3,8 +3,8 @@ package extensions
import ( import (
"encoding/json" "encoding/json"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
) )
// Client created request params // Client created request params

4
sync3/extensions/e2ee.go
View File

@ -1,8 +1,8 @@
package extensions package extensions
import ( import (
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
) )
// Client created request params // Client created request params

6
sync3/extensions/extensions.go
View File

@ -3,9 +3,9 @@ package extensions
import ( import (
"os" "os"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
"github.com/rs/zerolog" "github.com/rs/zerolog"
) )

4
sync3/extensions/receipts.go
View File

@ -3,8 +3,8 @@ package extensions
import ( import (
"encoding/json" "encoding/json"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
) )
// Client created request params // Client created request params

2
sync3/extensions/todevice.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
) )
// Client created request params // Client created request params

2
sync3/extensions/typing.go
View File

@ -3,7 +3,7 @@ package extensions
import ( import (
"encoding/json" "encoding/json"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
) )
// Client created request params // Client created request params

8
sync3/handler/connstate.go
View File

@ -6,10 +6,10 @@ import (
"runtime/trace" "runtime/trace"
"time" "time"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

8
sync3/handler/connstate_live.go
View File

@ -6,10 +6,10 @@ import (
"runtime/trace" "runtime/trace"
"time" "time"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
) )
var ( var (

12
sync3/handler/connstate_test.go
View File

@ -9,11 +9,11 @@ import (
"time" "time"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
) )
type NopExtensionHandler struct{} 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) { func TestBumpToOutsideRange(t *testing.T) {
ConnID := sync3.ConnID{ ConnID := sync3.ConnID{
DeviceID: "d", DeviceID: "d",

2
sync3/handler/ensure_polling.go
View File

@ -3,7 +3,7 @@ package handler
import ( import (
"sync" "sync"
"github.com/matrix-org/sync-v3/pubsub" "github.com/matrix-org/sliding-sync/pubsub"
) )
type pendingInfo struct { type pendingInfo struct {

14
sync3/handler/handler.go
View File

@ -11,13 +11,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/pubsub" "github.com/matrix-org/sliding-sync/pubsub"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/hlog" "github.com/rs/zerolog/hlog"

4
sync3/handler/rooms_builder.go
View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"sort" "sort"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
) )
// RoomsBuilder gradually accumulates and mixes data required in order to populate the top-level rooms key // RoomsBuilder gradually accumulates and mixes data required in order to populate the top-level rooms key

2
sync3/handler/rooms_builder_test.go
View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
) )
func TestRoomsBuilder(t *testing.T) { func TestRoomsBuilder(t *testing.T) {

2
sync3/lists.go
View File

@ -3,7 +3,7 @@ package sync3
import ( import (
"strings" "strings"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
) )
type OverwriteVal bool type OverwriteVal bool

2
sync3/main_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/rs/zerolog" "github.com/rs/zerolog"
) )

2
sync3/ops_test.go
View File

@ -6,7 +6,7 @@ import (
"math/rand" "math/rand"
"testing" "testing"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
) )
func TestCalculateListOps_BasicOperations(t *testing.T) { func TestCalculateListOps_BasicOperations(t *testing.T) {

4
sync3/request.go
View File

@ -5,8 +5,8 @@ import (
"encoding/json" "encoding/json"
"strings" "strings"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
) )
var ( var (

2
sync3/response.go
View File

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"strconv" "strconv"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

4
sync3/room.go
View File

@ -3,8 +3,8 @@ package sync3
import ( import (
"encoding/json" "encoding/json"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
) )
type Room struct { type Room struct {

2
sync3/sort.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"sort" "sort"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
) )
type RoomFinder interface { type RoomFinder interface {

4
sync3/sort_test.go
View File

@ -5,8 +5,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/sync3/caches" "github.com/matrix-org/sliding-sync/sync3/caches"
) )
type finder struct { type finder struct {

2
tests-e2e/client_test.go
View File

@ -19,7 +19,7 @@ import (
"time" "time"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

4
tests-e2e/lazy_loading_test.go
View File

@ -3,8 +3,8 @@ package syncv3_test
import ( import (
"testing" "testing"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
func TestLazyLoading(t *testing.T) { func TestLazyLoading(t *testing.T) {

4
tests-e2e/lists_test.go
View File

@ -6,8 +6,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
// Test that multiple lists can be independently scrolled through // Test that multiple lists can be independently scrolled through

4
tests-e2e/main_test.go
View File

@ -11,8 +11,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
var ( var (

4
tests-e2e/membership_transitions_test.go
View File

@ -4,8 +4,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
func TestRoomStateTransitions(t *testing.T) { func TestRoomStateTransitions(t *testing.T) {

4
tests-e2e/num_live_test.go
View File

@ -3,8 +3,8 @@ package syncv3_test
import ( import (
"testing" "testing"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
func TestNumLive(t *testing.T) { func TestNumLive(t *testing.T) {

2
tests-e2e/prev_batch_test.go
View File

@ -6,7 +6,7 @@ import (
"net/url" "net/url"
"testing" "testing"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
) )
func TestPrevBatch(t *testing.T) { func TestPrevBatch(t *testing.T) {

6
tests-e2e/receipts_test.go
View File

@ -4,9 +4,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
// Test that receipts are sent initially and during live streams // Test that receipts are sent initially and during live streams

4
tests-e2e/security_test.go
View File

@ -5,8 +5,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils/m" "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. // The purpose of these tests is to ensure that events for one user cannot leak to another user.

4
tests-e2e/spaces_test.go
View File

@ -4,8 +4,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
// Make this graph: // Make this graph:

4
tests-e2e/to_device_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/matrix-org/util" "github.com/matrix-org/util"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/extensions" "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 // Test that if you login to an account -> send a to-device message to this device -> initial proxy connection

4
tests-e2e/tombstone_test.go
View File

@ -6,8 +6,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

6
tests-e2e/typing_test.go
View File

@ -8,9 +8,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

6
tests-integration/bench_test.go
View File

@ -6,9 +6,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/rs/zerolog" "github.com/rs/zerolog"
) )

8
tests-integration/connection_test.go
View File

@ -7,10 +7,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

10
tests-integration/extensions_test.go
View File

@ -6,11 +6,11 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/extensions" "github.com/matrix-org/sliding-sync/sync3/extensions"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
var valTrue = true var valTrue = true

8
tests-integration/filters_test.go
View File

@ -4,10 +4,10 @@ import (
"encoding/json" "encoding/json"
"testing" "testing"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
// Test that filters work initially and whilst streamed. // Test that filters work initially and whilst streamed.

8
tests-integration/invite_test.go
View File

@ -4,10 +4,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
func TestStuckInvites(t *testing.T) { func TestStuckInvites(t *testing.T) {

6
tests-integration/metrics_test.go
View File

@ -8,9 +8,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
) )

8
tests-integration/notifications_test.go
View File

@ -6,10 +6,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
// Test that sort operations that favour notif counts always appear at the start of the list. // Test that sort operations that favour notif counts always appear at the start of the list.

6
tests-integration/rig_test.go
View File

@ -6,9 +6,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
) )
type FlushEnum int type FlushEnum int

8
tests-integration/room_names_test.go
View File

@ -6,10 +6,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
// Test that room names come through sanely. Additional testing to ensure we copy hero slices correctly. // Test that room names come through sanely. Additional testing to ensure we copy hero slices correctly.

8
tests-integration/room_subscriptions_test.go
View File

@ -5,10 +5,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "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 // Test that if you /join a room and then immediately add a room subscription for said room before the

8
tests-integration/slow_get_all_rooms_test.go
View File

@ -6,10 +6,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
) )
// - Test that you can get all rooms initially for a list // - Test that you can get all rooms initially for a list

8
tests-integration/timeline_test.go
View File

@ -6,10 +6,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
"github.com/tidwall/sjson" "github.com/tidwall/sjson"
) )

14
tests-integration/v3_test.go
View File

@ -17,13 +17,13 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
syncv3 "github.com/matrix-org/sync-v3" syncv3 "github.com/matrix-org/sliding-sync"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync2/handler2" "github.com/matrix-org/sliding-sync/sync2/handler2"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/matrix-org/sync-v3/sync3/handler" "github.com/matrix-org/sliding-sync/sync3/handler"
"github.com/matrix-org/sync-v3/testutils" "github.com/matrix-org/sliding-sync/testutils"
"github.com/matrix-org/sync-v3/testutils/m" "github.com/matrix-org/sliding-sync/testutils/m"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

2
testutils/m/match.go
View File

@ -8,7 +8,7 @@ import (
"sort" "sort"
"testing" "testing"
"github.com/matrix-org/sync-v3/sync3" "github.com/matrix-org/sliding-sync/sync3"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )

14
v3.go
View File

@ -1,4 +1,4 @@
package syncv3 package slidingsync
import ( import (
"encoding/json" "encoding/json"
@ -9,12 +9,12 @@ import (
"time" "time"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/matrix-org/sync-v3/internal" "github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sync-v3/pubsub" "github.com/matrix-org/sliding-sync/pubsub"
"github.com/matrix-org/sync-v3/state" "github.com/matrix-org/sliding-sync/state"
"github.com/matrix-org/sync-v3/sync2" "github.com/matrix-org/sliding-sync/sync2"
"github.com/matrix-org/sync-v3/sync2/handler2" "github.com/matrix-org/sliding-sync/sync2/handler2"
"github.com/matrix-org/sync-v3/sync3/handler" "github.com/matrix-org/sliding-sync/sync3/handler"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/hlog" "github.com/rs/zerolog/hlog"
) )