From 22ed48add4909da6153dfc3c1ed82642efd9c225 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 19 Oct 2022 22:59:33 +0200 Subject: [PATCH] fix: new ssbc urls --- README.md | 14 +++--- codec.go | 2 +- codec/cbor/cbor.go | 2 +- codec/json/codec.go | 4 +- codec/msgpack/msgpack.go | 4 +- go.mod | 17 ++----- go.sum | 51 ++++++--------------- indexes/badger/index.go | 8 ++-- indexes/badger/test/badger_test.go | 2 +- indexes/badger/test/test.go | 6 +-- indexes/index.go | 4 +- indexes/mapidx/map.go | 8 ++-- indexes/mapidx/test/map_test.go | 2 +- indexes/mapidx/test/test.go | 6 +-- indexes/mkv/index.go | 6 +-- indexes/mkv/test/mkv_test.go | 2 +- indexes/mkv/test/test.go | 6 +-- indexes/obv.go | 2 +- indexes/sinkindex.go | 4 +- indexes/test/all/all.go | 8 ++-- indexes/test/all/all_test.go | 2 +- indexes/test/registry.go | 2 +- indexes/test/seqsetidx.go | 2 +- indexes/test/setidx.go | 4 +- indexes/test/sinkindex.go | 6 +-- internal/persist/badger/badger.go | 2 +- internal/persist/badger/saver.go | 2 +- internal/persist/badger/shared_test.go | 2 +- internal/persist/fs/fs.go | 2 +- internal/persist/mkv/modernkv.go | 2 +- internal/persist/mkv/saver.go | 2 +- internal/persist/sqlite/saver.go | 2 +- internal/persist/sqlite/sqlite.go | 2 +- internal/persist/test/general_test.go | 10 ++-- internal/seqobsv/simple_test.go | 2 +- legacyflumeoffset/impl.go | 4 +- legacyflumeoffset/query.go | 4 +- legacyflumeoffset/test/get_test.go | 2 +- legacyflumeoffset/test/simple_test.go | 10 ++-- legacyflumeoffset/test/super_simple_test.go | 4 +- legacyflumeoffset/test/test.go | 12 ++--- legacyflumeoffset/test/testcodec.go | 2 +- log.go | 4 +- mem/log.go | 6 +-- mem/qry.go | 6 +-- mem/test/test.go | 6 +-- multilog/multilog.go | 4 +- multilog/roaring/badger/badger.go | 4 +- multilog/roaring/fs/fs.go | 4 +- multilog/roaring/mkv/mkv.go | 4 +- multilog/roaring/multilog.go | 12 ++--- multilog/roaring/qry.go | 4 +- multilog/roaring/sqlite/sqlite.go | 4 +- multilog/roaring/sublog.go | 10 ++-- multilog/roaring/test/roaring_test.go | 2 +- multilog/roaring/test/test.go | 14 +++--- multilog/sink.go | 4 +- multilog/test/all/all.go | 6 +-- multilog/test/all/all_test.go | 2 +- multilog/test/main.go | 6 +-- multilog/test/multilog.go | 14 +++--- multilog/test/multilog_live.go | 6 +-- multilog/test/sink.go | 10 ++-- multilog/test/sublog.go | 8 ++-- offset2/alter_replace_test.go | 4 +- offset2/alter_test.go | 6 +-- offset2/data.go | 2 +- offset2/journal.go | 2 +- offset2/log.go | 4 +- offset2/offset.go | 2 +- offset2/qry.go | 6 +-- offset2/rw_test.go | 4 +- offset2/test/pump.go | 6 +-- offset2/test/pumplive.go | 6 +-- offset2/test/test.go | 12 ++--- qry.go | 2 +- seq.go | 2 +- test/all/all.go | 4 +- test/all/all_test.go | 2 +- test/codec.go | 2 +- test/concurrent.go | 4 +- test/get.go | 2 +- test/main.go | 4 +- test/simple.go | 8 ++-- 84 files changed, 216 insertions(+), 248 deletions(-) diff --git a/README.md b/README.md index b5587c0..4029c73 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ SPDX-FileCopyrightText: 2021 The margaret Authors SPDX-License-Identifier: MIT --> -# Margaret [![Go Reference](https://pkg.go.dev/badge/go.cryptoscope.co/margaret.svg)](https://pkg.go.dev/go.cryptoscope.co/margaret) ![[Github Actions Tests](https://github.com/cryptoscope/margaret/actions/workflows/go.yml)](https://github.com/cryptoscope/margaret/actions/workflows/go.yml/badge.svg) [![Go Report Card](https://goreportcard.com/badge/go.cryptoscope.co/margaret)](https://goreportcard.com/report/go.cryptoscope.co/margaret) [![REUSE status](https://api.reuse.software/badge/github.com/cryptoscope/margaret)](https://api.reuse.software/info/github.com/cryptoscope/margaret) +# Margaret [![Go Reference](https://pkg.go.dev/badge/github.com/ssbc/margaret.svg)](https://pkg.go.dev/github.com/ssbc/margaret) ![[Github Actions Tests](https://github.com/ssbc/margaret/actions/workflows/go.yml)](https://github.com/ssbc/margaret/actions/workflows/go.yml/badge.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/ssbc/margaret)](https://goreportcard.com/report/github.com/ssbc/margaret) [![REUSE status](https://api.reuse.software/badge/github.com/ssbc/margaret)](https://api.reuse.software/info/github.com/ssbc/margaret) -Margaret is [`go-ssb`](https://github.com/cryptoscope/ssb)'s [append-only](https://en.wikipedia.org/wiki/Append-only) +Margaret is [`go-ssb`](https://github.com/ssbc/go-ssb)'s [append-only](https://en.wikipedia.org/wiki/Append-only) log\* provider, and greatly inspired by [flumedb](https://github.com/flumedb/flumedb). Compatible with Go 1.13+. ![margaret the log lady, 1989 edition](https://static.wikia.nocookie.net/twinpeaks/images/6/68/Logladyreplacement.jpg/revision/latest/scale-to-width-down/500?cb=20160906170235) @@ -16,19 +16,19 @@ log lady**_ Margaret has the following facilities: * an append-only log interface `.Append(interface{})`, `.Get(int64)` -* [queries](https://godocs.io/go.cryptoscope.co/margaret#Query) `.Query(...QuerySpec)` for retrieving ranges based on sequence numbers e.g. `.Gt(int64)`, or limiting the amount of data returned `.Limit(int64)` +* [queries](https://godocs.io/github.com/ssbc/margaret#Query) `.Query(...QuerySpec)` for retrieving ranges based on sequence numbers e.g. `.Gt(int64)`, or limiting the amount of data returned `.Limit(int64)` * a variety of index mechanisms, both for categorizing log entries into buckets and for creating virtual logs (aka sublogs) -Margaret is one of a few key components that make the [go implementation of ssb](https://github.com/cryptoscope/ssb/) tick, for example: -* [`ssb/sbot`](https://github.com/cryptoscope/ssb/) uses margaret for storing each peer's data +Margaret is one of a few key components that make the [go implementation of ssb](https://github.com/ssbc/go-ssb/) tick, for example: +* [`ssb/sbot`](https://github.com/ssbc/go-ssb/) uses margaret for storing each peer's data ### Log storage -Margaret outputs data according to the [`offset2`](https://godocs.io/go.cryptoscope.co/margaret/offset2) format, which is inspired by (but significantly differs from) [`flumelog-offset`](https://github.com/flumedb/flumelog-offset). +Margaret outputs data according to the [`offset2`](https://godocs.io/github.com/ssbc/margaret/offset2) format, which is inspired by (but significantly differs from) [`flumelog-offset`](https://github.com/flumedb/flumelog-offset). In brief: margaret stores the data of _all logs_ in the three following files: * `data` stores the actual data (with a length-prefix before each entry) * `ofst` indexes the starting locations for each data entry in `data` -* `jrnl` an integrity checking mechanism for all three files; a checksum of sorts, [more details](https://github.com/cryptoscope/margaret/blob/master/offset2/log.go#L215) +* `jrnl` an integrity checking mechanism for all three files; a checksum of sorts, [more details](https://github.com/ssbc/margaret/blob/master/offset2/log.go#L215) ## More details There are a few concepts that might be tough to digest for newcomers on first approach: diff --git a/codec.go b/codec.go index 171d803..e5b84c6 100644 --- a/codec.go +++ b/codec.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package margaret // import "go.cryptoscope.co/margaret" +package margaret // import "github.com/ssbc/margaret" import ( "io" diff --git a/codec/cbor/cbor.go b/codec/cbor/cbor.go index 4fb9cf2..d8575a4 100644 --- a/codec/cbor/cbor.go +++ b/codec/cbor/cbor.go @@ -10,8 +10,8 @@ import ( "reflect" "github.com/pkg/errors" + "github.com/ssbc/margaret" ugorjiCodec "github.com/ugorji/go/codec" - "go.cryptoscope.co/margaret" ) // New creates a msgpack codec diff --git a/codec/json/codec.go b/codec/json/codec.go index d68e61e..44ec97b 100644 --- a/codec/json/codec.go +++ b/codec/json/codec.go @@ -2,14 +2,14 @@ // // SPDX-License-Identifier: MIT -package json // import "go.cryptoscope.co/margaret/codec/json" +package json // import "github.com/ssbc/margaret/codec/json" import ( "encoding/json" "io" "reflect" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) // New creates a json codec that decodes into values of type tipe. diff --git a/codec/msgpack/msgpack.go b/codec/msgpack/msgpack.go index 090012c..495231f 100755 --- a/codec/msgpack/msgpack.go +++ b/codec/msgpack/msgpack.go @@ -2,14 +2,14 @@ // // SPDX-License-Identifier: MIT -package msgpack // import "go.cryptoscope.co/margaret/codec/msgpack" +package msgpack // import "github.com/ssbc/margaret/codec/msgpack" import ( "bytes" "io" "reflect" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" "github.com/pkg/errors" ugorjiCodec "github.com/ugorji/go/codec" diff --git a/go.mod b/go.mod index b7dc216..89b2580 100644 --- a/go.mod +++ b/go.mod @@ -2,31 +2,20 @@ // // SPDX-License-Identifier: MIT -module go.cryptoscope.co/margaret - go 1.16 +module github.com/ssbc/margaret + require ( github.com/dgraph-io/badger/v3 v3.2011.1 github.com/dgraph-io/sroar v0.0.0-20210524170324-9b164cbe6e02 - github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/keks/persist v0.0.0-20210520094901-9bdd97c1fad2 github.com/mattn/go-sqlite3 v1.11.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2 github.com/pkg/errors v0.9.1 + github.com/ssbc/go-luigi v0.3.7-0.20221019204020-324065b9a7c6 github.com/stretchr/testify v1.7.0 github.com/ugorji/go/codec v1.2.6 - go.cryptoscope.co/luigi v0.3.6-0.20200131144242-3256b54e72c8 go.mindeco.de v1.12.0 - golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect - golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - modernc.org/fileutil v1.0.1-0.20191220121946-b2535a37172b // indirect modernc.org/kv v1.0.3 - modernc.org/lldb v1.0.1 // indirect - modernc.org/mathutil v1.4.0 // indirect - modernc.org/zappy v1.0.3 // indirect ) diff --git a/go.sum b/go.sum index 186df4a..c681cb6 100644 --- a/go.sum +++ b/go.sum @@ -29,9 +29,8 @@ github.com/dgraph-io/ristretto v0.0.4-0.20210122082011-bb5d392ed82d h1:eQYOG6A4t github.com/dgraph-io/ristretto v0.0.4-0.20210122082011-bb5d392ed82d/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ= github.com/dgraph-io/sroar v0.0.0-20210524170324-9b164cbe6e02 h1:6mHpj3WJkiY65tdZxIMWdmU5Rj0l4OgqzsD2x3GQM4o= github.com/dgraph-io/sroar v0.0.0-20210524170324-9b164cbe6e02/go.mod h1:bdNPtQmcxoIQVkZEWZvX0n0/IDlHFab397xdBlP4OoE= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= -github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= @@ -49,30 +48,23 @@ github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/flatbuffers v1.12.0 h1:/PtAHvnBY4Kqnx/xCQ3OIV9uYcSFGScBsWI3Oogeh6w= github.com/google/flatbuffers v1.12.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-dap v0.2.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -135,6 +127,8 @@ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb6 github.com/spf13/pflag v0.0.0-20170417173400-9e4c21054fa1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/ssbc/go-luigi v0.3.7-0.20221019204020-324065b9a7c6 h1:4Mhg4qHaiX56eXNND9gGJAf0xzoRQQtfFFhv6wcIOIU= +github.com/ssbc/go-luigi v0.3.7-0.20221019204020-324065b9a7c6/go.mod h1:tBPMBysJeh1u3vStvrWe5w3YBC4fnbnGsLk5ML4D6do= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -152,8 +146,6 @@ github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPy github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.cryptoscope.co/luigi v0.3.6-0.20200131144242-3256b54e72c8 h1:83xMhOCA4LJdbvdS9btSWTpD+vJk6VJyoW8gV0kWzcc= -go.cryptoscope.co/luigi v0.3.6-0.20200131144242-3256b54e72c8/go.mod h1:vJZOaxKWLWTC5oRWBOGVVW9X+o6nikLZSYUF9bvPd2w= go.mindeco.de v1.12.0 h1:K5FHILjJlD/U1HJMs8Y9ZLwdfG4dPEsxw+e+eqg1wKc= go.mindeco.de v1.12.0/go.mod h1:dZty08izAk/rSX8wSLen4gMR4WDPYmA6vUTE0QtepHA= go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= @@ -186,9 +178,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -209,16 +200,13 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea h1:+WiDlPBBaO+h9vPNZi8uJ3k4BkKQB7Iow3aqwHVA5hI= -golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -233,7 +221,6 @@ golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -242,9 +229,6 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= @@ -254,29 +238,24 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= modernc.org/bufs v1.0.0/go.mod h1:0FCJ1mAhGiiFos8v2PISFhP2fEj3CK4/ACCLidqU/Ok= modernc.org/exp v1.0.0/go.mod h1:nfZshN9GU3d+mveZaR6VW2wJfh8gVBDgp8i2NZ/pFM8= +modernc.org/fileutil v1.0.0 h1:Z1AFLZwl6BO8A5NldQg/xTSjGLetp+1Ubvl4alfGx8w= modernc.org/fileutil v1.0.0/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8= -modernc.org/fileutil v1.0.1-0.20191220121946-b2535a37172b h1:dNorlY1gL/QGX0N6e0wMbymtVx3nO3bGFARv09CLlKA= -modernc.org/fileutil v1.0.1-0.20191220121946-b2535a37172b/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8= modernc.org/internal v1.0.0 h1:XMDsFDcBDsibbBnHB2xzljZ+B1yrOVLEFkKL2u15Glw= modernc.org/internal v1.0.0/go.mod h1:VUD/+JAkhCpvkUitlEOnhpVxCgsBI90oTzSCRcqQVSM= modernc.org/kv v1.0.3 h1:XfQ8Cs/aTlJ6o11SOt/pRsIAmQuj3oZ1nhqZPDz27T8= modernc.org/kv v1.0.3/go.mod h1:P2r1em6l8wFhU985V9wlLu8C4hYULT1pObxAGfTkAIk= +modernc.org/lldb v1.0.0 h1:6vjDJxQEfhlOLwl4bhpwIz00uyFK4EmSYcbwqwbynsc= modernc.org/lldb v1.0.0/go.mod h1:jcRvJGWfCGodDZz8BPwiKMJxGJngQ/5DrRapkQnLob8= -modernc.org/lldb v1.0.1 h1:VtkRpUW/fkzRKdfOJ7aQo8TWOC4A+F+Tl8En7rFS3ow= -modernc.org/lldb v1.0.1/go.mod h1:+PHMSs/M3AmQyfhU3ArzoiHfJ2pSgH4TCibGbk7Rhpc= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/mathutil v1.1.1 h1:FeylZSVX8S+58VsyJlkEj2bcpdytmp9MmDKZkKx8OIE= modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/mathutil v1.4.0 h1:GCjoRaBew8ECCKINQA2nYjzvufFW9YiEuuB+rQ9bn2E= -modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/sortutil v1.1.0 h1:oP3U4uM+NT/qBQcbg/K2iqAX0Nx7B1b6YZtq3Gk/PjM= modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k= +modernc.org/zappy v1.0.1 h1:gR01yosq33KPfCO9H/N2Mod+AdpPxkMmlJVo9FCd4wU= modernc.org/zappy v1.0.1/go.mod h1:O0z5BRBwgfXAYDDhMqz9xVj0omSIEpspvGcwsyBe3FM= -modernc.org/zappy v1.0.3 h1:Tr+P3kclDSrvC6zYBW2hWmOmu5SjG6PtvCt3RCjRmss= -modernc.org/zappy v1.0.3/go.mod h1:w/Akq8ipfols/xZJdR5IYiQNOqC80qz2mVvsEwEbkiI= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/indexes/badger/index.go b/indexes/badger/index.go index cfbea77..876fc91 100644 --- a/indexes/badger/index.go +++ b/indexes/badger/index.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package badger // import "go.cryptoscope.co/margaret/indexes/badger" +package badger // import "github.com/ssbc/margaret/indexes/badger" import ( "context" @@ -20,10 +20,10 @@ import ( "time" "github.com/dgraph-io/badger/v3" - "go.cryptoscope.co/luigi" + "github.com/ssbc/go-luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/indexes" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/indexes" ) // badger starts to complain >100k diff --git a/indexes/badger/test/badger_test.go b/indexes/badger/test/badger_test.go index ba49c08..ab31813 100644 --- a/indexes/badger/test/badger_test.go +++ b/indexes/badger/test/badger_test.go @@ -7,7 +7,7 @@ package test import ( "testing" - "go.cryptoscope.co/margaret/indexes/test" + "github.com/ssbc/margaret/indexes/test" ) func TestBadger(t *testing.T) { diff --git a/indexes/badger/test/test.go b/indexes/badger/test/test.go index 9973a0e..3bef10a 100644 --- a/indexes/badger/test/test.go +++ b/indexes/badger/test/test.go @@ -14,9 +14,9 @@ import ( "github.com/dgraph-io/badger/v3" - "go.cryptoscope.co/margaret/indexes" - libadger "go.cryptoscope.co/margaret/indexes/badger" - "go.cryptoscope.co/margaret/indexes/test" + "github.com/ssbc/margaret/indexes" + libadger "github.com/ssbc/margaret/indexes/badger" + "github.com/ssbc/margaret/indexes/test" ) func init() { diff --git a/indexes/index.go b/indexes/index.go index 9a0882d..4638e8f 100644 --- a/indexes/index.go +++ b/indexes/index.go @@ -10,8 +10,8 @@ import ( "io" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) // Addr is an address (or key) in the index. diff --git a/indexes/mapidx/map.go b/indexes/mapidx/map.go index fd0bd91..3800d4b 100644 --- a/indexes/mapidx/map.go +++ b/indexes/mapidx/map.go @@ -2,16 +2,16 @@ // // SPDX-License-Identifier: MIT -package mapidx // import "go.cryptoscope.co/margaret/indexes/mapidx" +package mapidx // import "github.com/ssbc/margaret/indexes/mapidx" import ( "context" "fmt" "sync" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/indexes" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/indexes" ) // New returns a new map based index diff --git a/indexes/mapidx/test/map_test.go b/indexes/mapidx/test/map_test.go index c8a8219..d3c4174 100644 --- a/indexes/mapidx/test/map_test.go +++ b/indexes/mapidx/test/map_test.go @@ -7,7 +7,7 @@ package test import ( "testing" - "go.cryptoscope.co/margaret/indexes/test" + "github.com/ssbc/margaret/indexes/test" ) func TestMap(t *testing.T) { diff --git a/indexes/mapidx/test/test.go b/indexes/mapidx/test/test.go index 8a71ed5..254c046 100644 --- a/indexes/mapidx/test/test.go +++ b/indexes/mapidx/test/test.go @@ -5,9 +5,9 @@ package test import ( - "go.cryptoscope.co/margaret/indexes" - "go.cryptoscope.co/margaret/indexes/mapidx" - "go.cryptoscope.co/margaret/indexes/test" + "github.com/ssbc/margaret/indexes" + "github.com/ssbc/margaret/indexes/mapidx" + "github.com/ssbc/margaret/indexes/test" ) func init() { diff --git a/indexes/mkv/index.go b/indexes/mkv/index.go index 85fa639..3679fe1 100644 --- a/indexes/mkv/index.go +++ b/indexes/mkv/index.go @@ -15,9 +15,9 @@ import ( "reflect" "sync" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/indexes" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/indexes" "modernc.org/kv" ) diff --git a/indexes/mkv/test/mkv_test.go b/indexes/mkv/test/mkv_test.go index c9d32cd..acf78ed 100644 --- a/indexes/mkv/test/mkv_test.go +++ b/indexes/mkv/test/mkv_test.go @@ -7,7 +7,7 @@ package test import ( "testing" - "go.cryptoscope.co/margaret/indexes/test" + "github.com/ssbc/margaret/indexes/test" ) func TestMKV(t *testing.T) { diff --git a/indexes/mkv/test/test.go b/indexes/mkv/test/test.go index a8d5b71..0fae350 100644 --- a/indexes/mkv/test/test.go +++ b/indexes/mkv/test/test.go @@ -12,9 +12,9 @@ import ( "modernc.org/kv" - "go.cryptoscope.co/margaret/indexes" - libmkv "go.cryptoscope.co/margaret/indexes/mkv" - "go.cryptoscope.co/margaret/indexes/test" + "github.com/ssbc/margaret/indexes" + libmkv "github.com/ssbc/margaret/indexes/mkv" + "github.com/ssbc/margaret/indexes/test" ) func init() { diff --git a/indexes/obv.go b/indexes/obv.go index 4672549..52a4262 100644 --- a/indexes/obv.go +++ b/indexes/obv.go @@ -7,7 +7,7 @@ package indexes import ( "sync" - "go.cryptoscope.co/luigi" + "github.com/ssbc/go-luigi" ) // NewObservable returns a regular observable that calls f when the last registration is cancelled. diff --git a/indexes/sinkindex.go b/indexes/sinkindex.go index 38a7cd7..9699fe7 100644 --- a/indexes/sinkindex.go +++ b/indexes/sinkindex.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) type StreamProcFunc func(context.Context, int64, interface{}, SetterIndex) error diff --git a/indexes/test/all/all.go b/indexes/test/all/all.go index 8be3360..d695479 100644 --- a/indexes/test/all/all.go +++ b/indexes/test/all/all.go @@ -6,9 +6,9 @@ package all import ( // imported only for side effects / registring testing helpers - _ "go.cryptoscope.co/margaret/test/all" + _ "github.com/ssbc/margaret/test/all" - _ "go.cryptoscope.co/margaret/indexes/badger/test" - _ "go.cryptoscope.co/margaret/indexes/mapidx/test" - _ "go.cryptoscope.co/margaret/indexes/mkv/test" + _ "github.com/ssbc/margaret/indexes/badger/test" + _ "github.com/ssbc/margaret/indexes/mapidx/test" + _ "github.com/ssbc/margaret/indexes/mkv/test" ) diff --git a/indexes/test/all/all_test.go b/indexes/test/all/all_test.go index 76a4733..15e6a49 100644 --- a/indexes/test/all/all_test.go +++ b/indexes/test/all/all_test.go @@ -7,7 +7,7 @@ package all import ( "testing" - ltest "go.cryptoscope.co/margaret/indexes/test" + ltest "github.com/ssbc/margaret/indexes/test" ) func Test(t *testing.T) { diff --git a/indexes/test/registry.go b/indexes/test/registry.go index cf8ae0d..d32d4e2 100644 --- a/indexes/test/registry.go +++ b/indexes/test/registry.go @@ -7,7 +7,7 @@ package test import ( "testing" - mtest "go.cryptoscope.co/margaret/test" + mtest "github.com/ssbc/margaret/test" ) var ( diff --git a/indexes/test/seqsetidx.go b/indexes/test/seqsetidx.go index 679ba18..d7d504b 100644 --- a/indexes/test/seqsetidx.go +++ b/indexes/test/seqsetidx.go @@ -8,9 +8,9 @@ import ( "context" "testing" + "github.com/ssbc/margaret/indexes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/margaret/indexes" ) type NewSeqSetterIndexFunc func(name string, tipe interface{}) (indexes.SeqSetterIndex, error) diff --git a/indexes/test/setidx.go b/indexes/test/setidx.go index c5f84ab..c7b25ad 100644 --- a/indexes/test/setidx.go +++ b/indexes/test/setidx.go @@ -8,9 +8,9 @@ import ( "context" "testing" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret/indexes" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret/indexes" ) type NewSetterIndexFunc func(name string, tipe interface{}) (indexes.SetterIndex, error) diff --git a/indexes/test/sinkindex.go b/indexes/test/sinkindex.go index ed99dd1..f71a831 100644 --- a/indexes/test/sinkindex.go +++ b/indexes/test/sinkindex.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret/indexes" - mtest "go.cryptoscope.co/margaret/test" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret/indexes" + mtest "github.com/ssbc/margaret/test" ) type NewSinkIndexFunc func(name string, tipe interface{}, f indexes.StreamProcFunc) (indexes.SinkIndex, error) diff --git a/internal/persist/badger/badger.go b/internal/persist/badger/badger.go index 9c3fa7c..a7ef0af 100644 --- a/internal/persist/badger/badger.go +++ b/internal/persist/badger/badger.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/dgraph-io/badger/v3" - "go.cryptoscope.co/margaret/internal/persist" + "github.com/ssbc/margaret/internal/persist" ) type BadgerSaver struct { diff --git a/internal/persist/badger/saver.go b/internal/persist/badger/saver.go index d6adc13..5f2d793 100644 --- a/internal/persist/badger/saver.go +++ b/internal/persist/badger/saver.go @@ -10,7 +10,7 @@ import ( "fmt" "github.com/dgraph-io/badger/v3" - "go.cryptoscope.co/margaret/internal/persist" + "github.com/ssbc/margaret/internal/persist" ) func (s BadgerSaver) Put(key persist.Key, data []byte) error { diff --git a/internal/persist/badger/shared_test.go b/internal/persist/badger/shared_test.go index 898a2e0..c550517 100644 --- a/internal/persist/badger/shared_test.go +++ b/internal/persist/badger/shared_test.go @@ -12,8 +12,8 @@ import ( "testing" "github.com/dgraph-io/badger/v3" + "github.com/ssbc/margaret/internal/persist" "github.com/stretchr/testify/require" - "go.cryptoscope.co/margaret/internal/persist" ) func TestSharedBadger(t *testing.T) { diff --git a/internal/persist/fs/fs.go b/internal/persist/fs/fs.go index 4f4e9a5..8fd33a0 100644 --- a/internal/persist/fs/fs.go +++ b/internal/persist/fs/fs.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/pkg/errors" - "go.cryptoscope.co/margaret/internal/persist" + "github.com/ssbc/margaret/internal/persist" ) type Saver struct { diff --git a/internal/persist/mkv/modernkv.go b/internal/persist/mkv/modernkv.go index 0ff18cc..56cd891 100644 --- a/internal/persist/mkv/modernkv.go +++ b/internal/persist/mkv/modernkv.go @@ -8,7 +8,7 @@ import ( "os" "github.com/pkg/errors" - "go.cryptoscope.co/margaret/internal/persist" + "github.com/ssbc/margaret/internal/persist" "modernc.org/kv" ) diff --git a/internal/persist/mkv/saver.go b/internal/persist/mkv/saver.go index 55ffa81..0b949ef 100644 --- a/internal/persist/mkv/saver.go +++ b/internal/persist/mkv/saver.go @@ -10,7 +10,7 @@ import ( "io" "github.com/pkg/errors" - "go.cryptoscope.co/margaret/internal/persist" + "github.com/ssbc/margaret/internal/persist" ) const pageSize = 64 * 1024 diff --git a/internal/persist/sqlite/saver.go b/internal/persist/sqlite/saver.go index 4784add..dbc013d 100644 --- a/internal/persist/sqlite/saver.go +++ b/internal/persist/sqlite/saver.go @@ -10,7 +10,7 @@ import ( "fmt" "github.com/pkg/errors" - "go.cryptoscope.co/margaret/internal/persist" + "github.com/ssbc/margaret/internal/persist" ) func (s SqliteSaver) Put(key persist.Key, data []byte) error { diff --git a/internal/persist/sqlite/sqlite.go b/internal/persist/sqlite/sqlite.go index 7458ee7..a50af03 100644 --- a/internal/persist/sqlite/sqlite.go +++ b/internal/persist/sqlite/sqlite.go @@ -10,7 +10,7 @@ import ( "path/filepath" "github.com/pkg/errors" - "go.cryptoscope.co/margaret/internal/persist" + "github.com/ssbc/margaret/internal/persist" ) type SqliteSaver struct { diff --git a/internal/persist/test/general_test.go b/internal/persist/test/general_test.go index 392114e..1d75818 100644 --- a/internal/persist/test/general_test.go +++ b/internal/persist/test/general_test.go @@ -12,12 +12,12 @@ import ( "path/filepath" "testing" + "github.com/ssbc/margaret/internal/persist" + "github.com/ssbc/margaret/internal/persist/badger" + "github.com/ssbc/margaret/internal/persist/fs" + "github.com/ssbc/margaret/internal/persist/mkv" + "github.com/ssbc/margaret/internal/persist/sqlite" "github.com/stretchr/testify/require" - "go.cryptoscope.co/margaret/internal/persist" - "go.cryptoscope.co/margaret/internal/persist/badger" - "go.cryptoscope.co/margaret/internal/persist/fs" - "go.cryptoscope.co/margaret/internal/persist/mkv" - "go.cryptoscope.co/margaret/internal/persist/sqlite" _ "github.com/mattn/go-sqlite3" ) diff --git a/internal/seqobsv/simple_test.go b/internal/seqobsv/simple_test.go index 52f5147..8d4af38 100644 --- a/internal/seqobsv/simple_test.go +++ b/internal/seqobsv/simple_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "go.cryptoscope.co/margaret/internal/seqobsv" + "github.com/ssbc/margaret/internal/seqobsv" ) func ExampleInc() { diff --git a/legacyflumeoffset/impl.go b/legacyflumeoffset/impl.go index 9057303..ca5ab8e 100644 --- a/legacyflumeoffset/impl.go +++ b/legacyflumeoffset/impl.go @@ -26,8 +26,8 @@ import ( "path/filepath" "sync" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) type Log struct { diff --git a/legacyflumeoffset/query.go b/legacyflumeoffset/query.go index 7467ee5..6a9fbd0 100644 --- a/legacyflumeoffset/query.go +++ b/legacyflumeoffset/query.go @@ -11,8 +11,8 @@ import ( "io" "sync" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) type lfoQuery struct { diff --git a/legacyflumeoffset/test/get_test.go b/legacyflumeoffset/test/get_test.go index b18d23e..6e2f789 100644 --- a/legacyflumeoffset/test/get_test.go +++ b/legacyflumeoffset/test/get_test.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" + mtest "github.com/ssbc/margaret/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - mtest "go.cryptoscope.co/margaret/test" ) func TestGet(t *testing.T) { diff --git a/legacyflumeoffset/test/simple_test.go b/legacyflumeoffset/test/simple_test.go index f98e2af..ff3cba5 100644 --- a/legacyflumeoffset/test/simple_test.go +++ b/legacyflumeoffset/test/simple_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/codec/json" + "github.com/ssbc/margaret/legacyflumeoffset" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/codec/json" - "go.cryptoscope.co/margaret/legacyflumeoffset" ) func TestSimple(t *testing.T) { @@ -194,7 +194,7 @@ func TestSimple(t *testing.T) { errStr: "end of stream", }, - // BUG(cryptix): the iterators needs to be improved to handle these correctly (https://github.com/cryptoscope/margaret/issues/6) + // BUG(cryptix): the iterators needs to be improved to handle these correctly (https://github.com/ssbc/margaret/issues/6) // { // name: "reverse and gte", // tipe: 0, diff --git a/legacyflumeoffset/test/super_simple_test.go b/legacyflumeoffset/test/super_simple_test.go index 7b5f7a9..0a0abfa 100644 --- a/legacyflumeoffset/test/super_simple_test.go +++ b/legacyflumeoffset/test/super_simple_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" + "github.com/ssbc/margaret" + lfo "github.com/ssbc/margaret/legacyflumeoffset" "github.com/stretchr/testify/require" - "go.cryptoscope.co/margaret" - lfo "go.cryptoscope.co/margaret/legacyflumeoffset" ) func TestShortExample(t *testing.T) { diff --git a/legacyflumeoffset/test/test.go b/legacyflumeoffset/test/test.go index 315eb17..1f127b5 100644 --- a/legacyflumeoffset/test/test.go +++ b/legacyflumeoffset/test/test.go @@ -8,12 +8,12 @@ import ( "os" "path/filepath" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/codec/cbor" - "go.cryptoscope.co/margaret/codec/json" - "go.cryptoscope.co/margaret/codec/msgpack" - lfo "go.cryptoscope.co/margaret/legacyflumeoffset" - mtest "go.cryptoscope.co/margaret/test" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/codec/cbor" + "github.com/ssbc/margaret/codec/json" + "github.com/ssbc/margaret/codec/msgpack" + lfo "github.com/ssbc/margaret/legacyflumeoffset" + mtest "github.com/ssbc/margaret/test" ) var newLogFuncs map[string]mtest.NewLogFunc diff --git a/legacyflumeoffset/test/testcodec.go b/legacyflumeoffset/test/testcodec.go index 6aa0b6e..a74e3b7 100644 --- a/legacyflumeoffset/test/testcodec.go +++ b/legacyflumeoffset/test/testcodec.go @@ -11,7 +11,7 @@ import ( "io/ioutil" "github.com/pkg/errors" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) type testCodec struct{} diff --git a/log.go b/log.go index 66f22d1..9abe513 100644 --- a/log.go +++ b/log.go @@ -2,12 +2,12 @@ // // SPDX-License-Identifier: MIT -package margaret // import "go.cryptoscope.co/margaret" +package margaret // import "github.com/ssbc/margaret" import ( "errors" - "go.cryptoscope.co/luigi" + "github.com/ssbc/go-luigi" ) // Log stores entries sequentially, which can be queried individually using Get or as streams using Query. diff --git a/mem/log.go b/mem/log.go index a4302bf..abd2f9d 100644 --- a/mem/log.go +++ b/mem/log.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package mem // import "go.cryptoscope.co/margaret/mem" +package mem // import "github.com/ssbc/margaret/mem" import ( "context" @@ -10,8 +10,8 @@ import ( "sync" "github.com/pkg/errors" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) // TODO optimization idea: skip list diff --git a/mem/qry.go b/mem/qry.go index f75479c..3aa6934 100644 --- a/mem/qry.go +++ b/mem/qry.go @@ -2,16 +2,16 @@ // // SPDX-License-Identifier: MIT -package mem // import "go.cryptoscope.co/margaret/mem" +package mem // import "github.com/ssbc/margaret/mem" import ( "context" "fmt" "github.com/pkg/errors" - "go.cryptoscope.co/luigi" + "github.com/ssbc/go-luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) type memlogQuery struct { diff --git a/mem/test/test.go b/mem/test/test.go index 9660808..9ae8524 100644 --- a/mem/test/test.go +++ b/mem/test/test.go @@ -5,9 +5,9 @@ package test import ( - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/mem" - mtest "go.cryptoscope.co/margaret/test" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/mem" + mtest "github.com/ssbc/margaret/test" ) func init() { diff --git a/multilog/multilog.go b/multilog/multilog.go index e7ddfed..a2bb2a6 100644 --- a/multilog/multilog.go +++ b/multilog/multilog.go @@ -8,8 +8,8 @@ import ( "errors" "io" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/indexes" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/indexes" ) var ( diff --git a/multilog/roaring/badger/badger.go b/multilog/roaring/badger/badger.go index e0a0d2d..f9f25b5 100644 --- a/multilog/roaring/badger/badger.go +++ b/multilog/roaring/badger/badger.go @@ -7,8 +7,8 @@ package badger import ( "github.com/dgraph-io/badger/v3" - pbadger "go.cryptoscope.co/margaret/internal/persist/badger" - "go.cryptoscope.co/margaret/multilog/roaring" + pbadger "github.com/ssbc/margaret/internal/persist/badger" + "github.com/ssbc/margaret/multilog/roaring" ) func NewStandalone(base string) (*roaring.MultiLog, error) { diff --git a/multilog/roaring/fs/fs.go b/multilog/roaring/fs/fs.go index a91a671..9d79b1f 100644 --- a/multilog/roaring/fs/fs.go +++ b/multilog/roaring/fs/fs.go @@ -5,8 +5,8 @@ package fs import ( - "go.cryptoscope.co/margaret/internal/persist/fs" - "go.cryptoscope.co/margaret/multilog/roaring" + "github.com/ssbc/margaret/internal/persist/fs" + "github.com/ssbc/margaret/multilog/roaring" ) func NewMultiLog(base string) (*roaring.MultiLog, error) { diff --git a/multilog/roaring/mkv/mkv.go b/multilog/roaring/mkv/mkv.go index 4b3086d..c23d8d6 100644 --- a/multilog/roaring/mkv/mkv.go +++ b/multilog/roaring/mkv/mkv.go @@ -5,8 +5,8 @@ package mkv import ( - "go.cryptoscope.co/margaret/internal/persist/mkv" - "go.cryptoscope.co/margaret/multilog/roaring" + "github.com/ssbc/margaret/internal/persist/mkv" + "github.com/ssbc/margaret/multilog/roaring" ) func NewMultiLog(base string) (*roaring.MultiLog, error) { diff --git a/multilog/roaring/multilog.go b/multilog/roaring/multilog.go index 0d5fab2..a85249b 100644 --- a/multilog/roaring/multilog.go +++ b/multilog/roaring/multilog.go @@ -13,13 +13,13 @@ import ( "time" "github.com/dgraph-io/sroar" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret/indexes" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret/indexes" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/internal/persist" - "go.cryptoscope.co/margaret/internal/seqobsv" - "go.cryptoscope.co/margaret/multilog" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/internal/persist" + "github.com/ssbc/margaret/internal/seqobsv" + "github.com/ssbc/margaret/multilog" ) // NewStore returns a new multilog that is only good to store sequences diff --git a/multilog/roaring/qry.go b/multilog/roaring/qry.go index dd35824..73f3e92 100644 --- a/multilog/roaring/qry.go +++ b/multilog/roaring/qry.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) type query struct { diff --git a/multilog/roaring/sqlite/sqlite.go b/multilog/roaring/sqlite/sqlite.go index e31eae6..955ef4e 100644 --- a/multilog/roaring/sqlite/sqlite.go +++ b/multilog/roaring/sqlite/sqlite.go @@ -5,8 +5,8 @@ package sqlite import ( - "go.cryptoscope.co/margaret/internal/persist/sqlite" - "go.cryptoscope.co/margaret/multilog/roaring" + "github.com/ssbc/margaret/internal/persist/sqlite" + "github.com/ssbc/margaret/multilog/roaring" ) func NewMultiLog(base string) (*roaring.MultiLog, error) { diff --git a/multilog/roaring/sublog.go b/multilog/roaring/sublog.go index a03c8b7..21a3b90 100644 --- a/multilog/roaring/sublog.go +++ b/multilog/roaring/sublog.go @@ -8,12 +8,12 @@ import ( "fmt" "github.com/dgraph-io/sroar" - "go.cryptoscope.co/luigi" + "github.com/ssbc/go-luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/internal/persist" - "go.cryptoscope.co/margaret/internal/seqobsv" - "go.cryptoscope.co/margaret/multilog" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/internal/persist" + "github.com/ssbc/margaret/internal/seqobsv" + "github.com/ssbc/margaret/multilog" ) type sublog struct { diff --git a/multilog/roaring/test/roaring_test.go b/multilog/roaring/test/roaring_test.go index 3ffcdd4..3af437d 100644 --- a/multilog/roaring/test/roaring_test.go +++ b/multilog/roaring/test/roaring_test.go @@ -7,7 +7,7 @@ package test import ( "testing" - "go.cryptoscope.co/margaret/multilog/test" + "github.com/ssbc/margaret/multilog/test" ) func TestRoaringFiles(t *testing.T) { diff --git a/multilog/roaring/test/test.go b/multilog/roaring/test/test.go index 429db63..ef8d9b4 100644 --- a/multilog/roaring/test/test.go +++ b/multilog/roaring/test/test.go @@ -12,13 +12,13 @@ import ( _ "github.com/mattn/go-sqlite3" "github.com/pkg/errors" - "go.cryptoscope.co/margaret/internal/persist/fs" - "go.cryptoscope.co/margaret/multilog" - "go.cryptoscope.co/margaret/multilog/roaring" - "go.cryptoscope.co/margaret/multilog/roaring/badger" - "go.cryptoscope.co/margaret/multilog/roaring/mkv" - "go.cryptoscope.co/margaret/multilog/roaring/sqlite" - mltest "go.cryptoscope.co/margaret/multilog/test" + "github.com/ssbc/margaret/internal/persist/fs" + "github.com/ssbc/margaret/multilog" + "github.com/ssbc/margaret/multilog/roaring" + "github.com/ssbc/margaret/multilog/roaring/badger" + "github.com/ssbc/margaret/multilog/roaring/mkv" + "github.com/ssbc/margaret/multilog/roaring/sqlite" + mltest "github.com/ssbc/margaret/multilog/test" ) func init() { diff --git a/multilog/sink.go b/multilog/sink.go index b506984..61fec9f 100644 --- a/multilog/sink.go +++ b/multilog/sink.go @@ -12,8 +12,8 @@ import ( "github.com/keks/persist" "github.com/pkg/errors" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) // Func is a processing function that consumes a stream and sets values in the multilog. diff --git a/multilog/test/all/all.go b/multilog/test/all/all.go index 5872f1c..4b35ba7 100644 --- a/multilog/test/all/all.go +++ b/multilog/test/all/all.go @@ -6,8 +6,8 @@ package all import ( // import to register testing helpers - _ "go.cryptoscope.co/margaret/mem/test" - _ "go.cryptoscope.co/margaret/offset2/test" + _ "github.com/ssbc/margaret/mem/test" + _ "github.com/ssbc/margaret/offset2/test" - _ "go.cryptoscope.co/margaret/multilog/roaring/test" + _ "github.com/ssbc/margaret/multilog/roaring/test" ) diff --git a/multilog/test/all/all_test.go b/multilog/test/all/all_test.go index 91eea58..94418e5 100644 --- a/multilog/test/all/all_test.go +++ b/multilog/test/all/all_test.go @@ -7,7 +7,7 @@ package all import ( "testing" - mltest "go.cryptoscope.co/margaret/multilog/test" + mltest "github.com/ssbc/margaret/multilog/test" ) func TestSink(t *testing.T) { diff --git a/multilog/test/main.go b/multilog/test/main.go index f4688c0..8b70223 100644 --- a/multilog/test/main.go +++ b/multilog/test/main.go @@ -2,12 +2,12 @@ // // SPDX-License-Identifier: MIT -package test // import "go.cryptoscope.co/margaret/multilog/test" +package test // import "github.com/ssbc/margaret/multilog/test" import ( "testing" - "go.cryptoscope.co/margaret/multilog" + "github.com/ssbc/margaret/multilog" ) type NewLogFunc func(name string, tipe interface{}, testdir string) (multilog.MultiLog, string, error) @@ -21,7 +21,7 @@ func SinkTest(f NewLogFunc) func(*testing.T) { func MultiLogTest(f NewLogFunc) func(*testing.T) { return func(t *testing.T) { // makes sure local fork reproduction doesn't make a reappearance - t.Run("GetFreshThenReopenAndLogSomeMore", MultilogTestGetFreshLogCloseThenOpenAgain(f)) + t.Run("GetFreshThenReopenAndLogSomeMore", MultilogTestGetFreshLogCloseThenOpenAgain(f)) t.Run("MultiSimple", MultiLogTestSimple(f)) t.Run("Live", MultilogLiveQueryCheck(f)) } diff --git a/multilog/test/multilog.go b/multilog/test/multilog.go index 6610dca..f51984c 100644 --- a/multilog/test/multilog.go +++ b/multilog/test/multilog.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/indexes" - "go.cryptoscope.co/margaret/multilog" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/indexes" + "github.com/ssbc/margaret/multilog" ) // cblgh: tests to make sure the local fork reproduction that was found when testing against @@ -31,7 +31,7 @@ import ( // Some time later: start it again // Post more messages (entries in a sublog) // Uh-oh the first new message seems to fork, using the previous-to-last message (instead of the last message) as it's previous reference, and with a seqno that is one less than it should be -// +// func MultilogTestGetFreshLogCloseThenOpenAgain(f NewLogFunc) func(*testing.T) { return func(t *testing.T) { a := assert.New(t) @@ -90,7 +90,7 @@ func MultilogTestGetFreshLogCloseThenOpenAgain(f NewLogFunc) func(*testing.T) { r.NoError(err) r.NotNil(sublog) - for i, v := range vals { + for i, v := range vals { val, err := sublog.Get(int64(i)) r.NoError(err) r.EqualValues(v, val) @@ -454,7 +454,7 @@ func MultiLogTestSimple(f NewLogFunc) func(*testing.T) { }, }, - // BUG(cryptix): roaring does not implement reverse right now and just throws an error (https://github.com/cryptoscope/margaret/issues/7) + // BUG(cryptix): roaring does not implement reverse right now and just throws an error (https://github.com/ssbc/margaret/issues/7) { name: "reverse", tipe: int64(0), diff --git a/multilog/test/multilog_live.go b/multilog/test/multilog_live.go index a5aac16..fbb0ca3 100644 --- a/multilog/test/multilog_live.go +++ b/multilog/test/multilog_live.go @@ -11,11 +11,11 @@ import ( "github.com/pkg/errors" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/indexes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/indexes" ) func MultilogLiveQueryCheck(f NewLogFunc) func(*testing.T) { diff --git a/multilog/test/sink.go b/multilog/test/sink.go index ea909dc..0aed4cc 100644 --- a/multilog/test/sink.go +++ b/multilog/test/sink.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package test // import "go.cryptoscope.co/margaret/multilog/test" +package test // import "github.com/ssbc/margaret/multilog/test" import ( "context" @@ -18,10 +18,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/indexes" - "go.cryptoscope.co/margaret/multilog" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/indexes" + "github.com/ssbc/margaret/multilog" ) func SinkTestSimple(f NewLogFunc) func(*testing.T) { diff --git a/multilog/test/sublog.go b/multilog/test/sublog.go index 0843d6b..d3a0084 100644 --- a/multilog/test/sublog.go +++ b/multilog/test/sublog.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package test // import "go.cryptoscope.co/margaret/multilog/test" +package test // import "github.com/ssbc/margaret/multilog/test" import ( "errors" @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/indexes" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/indexes" ) func SubLogTestGet(f NewLogFunc) func(*testing.T) { diff --git a/offset2/alter_replace_test.go b/offset2/alter_replace_test.go index 3da3ae8..c366634 100644 --- a/offset2/alter_replace_test.go +++ b/offset2/alter_replace_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" + "github.com/ssbc/go-luigi" + mjson "github.com/ssbc/margaret/codec/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - mjson "go.cryptoscope.co/margaret/codec/json" ) func TestReplace(t *testing.T) { diff --git a/offset2/alter_test.go b/offset2/alter_test.go index 3a6f0f3..9e3f4ed 100644 --- a/offset2/alter_test.go +++ b/offset2/alter_test.go @@ -12,11 +12,11 @@ import ( "strconv" "testing" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + mjson "github.com/ssbc/margaret/codec/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - mjson "go.cryptoscope.co/margaret/codec/json" ) var _ margaret.Alterer = (*OffsetLog)(nil) diff --git a/offset2/data.go b/offset2/data.go index c970baa..32601ab 100644 --- a/offset2/data.go +++ b/offset2/data.go @@ -11,7 +11,7 @@ import ( "io" "os" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) type data struct { diff --git a/offset2/journal.go b/offset2/journal.go index 44ef0d8..b0466dd 100644 --- a/offset2/journal.go +++ b/offset2/journal.go @@ -10,7 +10,7 @@ import ( "io" "os" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) type journal struct { diff --git a/offset2/log.go b/offset2/log.go index 1bb5169..97af37f 100644 --- a/offset2/log.go +++ b/offset2/log.go @@ -38,8 +38,8 @@ import ( "path/filepath" "sync" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) type OffsetLog struct { diff --git a/offset2/offset.go b/offset2/offset.go index 61d619b..977b868 100644 --- a/offset2/offset.go +++ b/offset2/offset.go @@ -10,7 +10,7 @@ import ( "io" "os" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) type offset struct { diff --git a/offset2/qry.go b/offset2/qry.go index f1951f5..257df22 100644 --- a/offset2/qry.go +++ b/offset2/qry.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package offset2 // import "go.cryptoscope.co/margaret/offset2" +package offset2 // import "github.com/ssbc/margaret/offset2" import ( "context" @@ -13,8 +13,8 @@ import ( "sync" "syscall" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) type offsetQuery struct { diff --git a/offset2/rw_test.go b/offset2/rw_test.go index 692edcc..5ba1cb7 100644 --- a/offset2/rw_test.go +++ b/offset2/rw_test.go @@ -10,9 +10,9 @@ import ( "os" "testing" + "github.com/ssbc/go-luigi" + mjson "github.com/ssbc/margaret/codec/json" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - mjson "go.cryptoscope.co/margaret/codec/json" ) type testEvent struct { diff --git a/offset2/test/pump.go b/offset2/test/pump.go index 4ff87a8..3aa2ea6 100644 --- a/offset2/test/pump.go +++ b/offset2/test/pump.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - mtest "go.cryptoscope.co/margaret/test" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + mtest "github.com/ssbc/margaret/test" ) func LogTestPump(f mtest.NewLogFunc) func(*testing.T) { diff --git a/offset2/test/pumplive.go b/offset2/test/pumplive.go index 2120bc6..cd9f134 100644 --- a/offset2/test/pumplive.go +++ b/offset2/test/pumplive.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" - mtest "go.cryptoscope.co/margaret/test" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" + mtest "github.com/ssbc/margaret/test" ) func LogTestPumpLive(f mtest.NewLogFunc) func(*testing.T) { diff --git a/offset2/test/test.go b/offset2/test/test.go index 51a7c65..f60ad91 100644 --- a/offset2/test/test.go +++ b/offset2/test/test.go @@ -5,12 +5,12 @@ package test import ( - "go.cryptoscope.co/margaret" - "go.cryptoscope.co/margaret/codec/cbor" - "go.cryptoscope.co/margaret/codec/json" - "go.cryptoscope.co/margaret/codec/msgpack" - "go.cryptoscope.co/margaret/offset2" - mtest "go.cryptoscope.co/margaret/test" + "github.com/ssbc/margaret" + "github.com/ssbc/margaret/codec/cbor" + "github.com/ssbc/margaret/codec/json" + "github.com/ssbc/margaret/codec/msgpack" + "github.com/ssbc/margaret/offset2" + mtest "github.com/ssbc/margaret/test" ) var newLogFuncs map[string]mtest.NewLogFunc diff --git a/qry.go b/qry.go index b2af3de..9611b0a 100644 --- a/qry.go +++ b/qry.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package margaret // import "go.cryptoscope.co/margaret" +package margaret // import "github.com/ssbc/margaret" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o mock/qry.go . Query diff --git a/seq.go b/seq.go index 6db0de5..0f5ab67 100644 --- a/seq.go +++ b/seq.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package margaret // import "go.cryptoscope.co/margaret" +package margaret // import "github.com/ssbc/margaret" const ( // SeqEmpty is the current sequence number of an empty log diff --git a/test/all/all.go b/test/all/all.go index aa419c8..9b80ce2 100644 --- a/test/all/all.go +++ b/test/all/all.go @@ -6,7 +6,7 @@ package all import ( // import to register testing helpers - _ "go.cryptoscope.co/margaret/mem/test" + _ "github.com/ssbc/margaret/mem/test" - _ "go.cryptoscope.co/margaret/offset2/test" + _ "github.com/ssbc/margaret/offset2/test" ) diff --git a/test/all/all_test.go b/test/all/all_test.go index 2a3db6e..f958f05 100644 --- a/test/all/all_test.go +++ b/test/all/all_test.go @@ -7,7 +7,7 @@ package all import ( "testing" - mtest "go.cryptoscope.co/margaret/test" + mtest "github.com/ssbc/margaret/test" ) func TestLog(t *testing.T) { diff --git a/test/codec.go b/test/codec.go index 97d1baf..0ea5857 100644 --- a/test/codec.go +++ b/test/codec.go @@ -5,7 +5,7 @@ package test import ( - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) // NewCodecFunc is a function that returns a codec diff --git a/test/concurrent.go b/test/concurrent.go index 9201d0d..896187d 100644 --- a/test/concurrent.go +++ b/test/concurrent.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package test // import "go.cryptoscope.co/margaret/test" +package test // import "github.com/ssbc/margaret/test" import ( "context" @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) func LogTestConcurrent(f NewLogFunc) func(*testing.T) { diff --git a/test/get.go b/test/get.go index c61f48b..c9a01b2 100644 --- a/test/get.go +++ b/test/get.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package test // import "go.cryptoscope.co/margaret/test" +package test // import "github.com/ssbc/margaret/test" import ( "fmt" diff --git a/test/main.go b/test/main.go index b7db17a..3e7321b 100644 --- a/test/main.go +++ b/test/main.go @@ -2,12 +2,12 @@ // // SPDX-License-Identifier: MIT -package test // import "go.cryptoscope.co/margaret/test" +package test // import "github.com/ssbc/margaret/test" import ( "testing" - "go.cryptoscope.co/margaret" + "github.com/ssbc/margaret" ) type NewLogFunc func(string, interface{}) (margaret.Log, error) diff --git a/test/simple.go b/test/simple.go index d8cecf8..12f9050 100644 --- a/test/simple.go +++ b/test/simple.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -package test // import "go.cryptoscope.co/margaret/test" +package test // import "github.com/ssbc/margaret/test" import ( "context" @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.cryptoscope.co/luigi" - "go.cryptoscope.co/margaret" + "github.com/ssbc/go-luigi" + "github.com/ssbc/margaret" ) func LogTestSimple(f NewLogFunc) func(*testing.T) { @@ -195,7 +195,7 @@ func LogTestSimple(f NewLogFunc) func(*testing.T) { errStr: "end of stream", }, - // BUG(cryptix): the iterators needs to be improved to handle these correctly (https://github.com/cryptoscope/margaret/issues/6) + // BUG(cryptix): the iterators needs to be improved to handle these correctly (https://github.com/ssbc/margaret/issues/6) // { // name: "reverse and gte", // tipe: 0,