mirror of
https://github.com/LBRYFoundation/reflector.go.git
synced 2025-09-21 02:19:46 +00:00
fix tests
fix build
This commit is contained in:
parent
7b3cca45b4
commit
8bfe7e101d
8 changed files with 341480 additions and 17 deletions
2
.github/workflows/go.yml
vendored
2
.github/workflows/go.yml
vendored
|
@ -16,7 +16,7 @@ jobs:
|
|||
- name: Set up Go
|
||||
uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: 1.22.x
|
||||
go-version: 1.23.x
|
||||
|
||||
- name: Build linux
|
||||
run: make linux
|
||||
|
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
@ -15,7 +15,7 @@ jobs:
|
|||
- name: Set up Go
|
||||
uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: 1.22.x
|
||||
go-version: 1.23.x
|
||||
|
||||
- name: Build linux
|
||||
run: make linux
|
||||
|
|
|
@ -3,7 +3,7 @@ dist: bionic
|
|||
language: go
|
||||
|
||||
go:
|
||||
- 1.22.x
|
||||
- 1.23.x
|
||||
|
||||
cache:
|
||||
directories:
|
||||
|
|
|
@ -31,7 +31,7 @@ func testCmd(cmd *cobra.Command, args []string) {
|
|||
|
||||
memStore := store.NewMemStore(store.MemParams{Name: "test"})
|
||||
|
||||
reflectorServer := reflector.NewServer(memStore, memStore)
|
||||
reflectorServer := reflector.NewIngestionServer(memStore)
|
||||
reflectorServer.Timeout = 3 * time.Minute
|
||||
|
||||
err := reflectorServer.Start(":" + strconv.Itoa(reflector.DefaultPort))
|
||||
|
|
341472
livelock.log
Normal file
341472
livelock.log
Normal file
File diff suppressed because it is too large
Load diff
|
@ -80,7 +80,7 @@ func New(conf *Config) *Prism {
|
|||
dht: d,
|
||||
cluster: c,
|
||||
peer: peer.NewServer(conf.Blobs, fmt.Sprintf(":%d", conf.PeerPort)),
|
||||
reflector: reflector.NewServer(conf.Blobs, conf.Blobs),
|
||||
reflector: reflector.NewIngestionServer(conf.Blobs),
|
||||
|
||||
grp: stop.New(),
|
||||
}
|
||||
|
|
|
@ -45,15 +45,6 @@ type Server struct {
|
|||
grp *stop.Group
|
||||
}
|
||||
|
||||
// NewServer returns an initialized reflector server pointer.
|
||||
func NewServer(underlying store.BlobStore, outer store.BlobStore) *Server {
|
||||
return &Server{
|
||||
Timeout: DefaultTimeout,
|
||||
//underlyingStore: underlying,
|
||||
//outerStore: outer,
|
||||
grp: stop.New(),
|
||||
}
|
||||
}
|
||||
func NewIngestionServer(store store.BlobStore) *Server {
|
||||
return &Server{
|
||||
Timeout: DefaultTimeout,
|
||||
|
|
|
@ -23,7 +23,7 @@ func startServerOnRandomPort(t *testing.T) (*Server, int) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
srv := NewServer(store.NewMemStore(store.MemParams{Name: "test"}), store.NewMemStore(store.MemParams{Name: "test"}))
|
||||
srv := NewIngestionServer(store.NewMemStore(store.MemParams{Name: "test"}))
|
||||
err = srv.Start("127.0.0.1:" + strconv.Itoa(port))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
@ -120,7 +120,7 @@ func TestServer_Timeout(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
srv := NewServer(store.NewMemStore(store.MemParams{Name: "test"}), store.NewMemStore(store.MemParams{Name: "test"}))
|
||||
srv := NewIngestionServer(store.NewMemStore(store.MemParams{Name: "test"}))
|
||||
srv.Timeout = testTimeout
|
||||
err = srv.Start("127.0.0.1:" + strconv.Itoa(port))
|
||||
if err != nil {
|
||||
|
@ -191,7 +191,7 @@ func TestServer_PartialUpload(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
srv := NewServer(st, st)
|
||||
srv := NewIngestionServer(st)
|
||||
err = srv.Start("127.0.0.1:" + strconv.Itoa(port))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
|
Loading…
Add table
Reference in a new issue