Skip to content

chore: remove duplicate package import #3775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
j0sh merged 2 commits into from
Oct 15, 2025
Merged

chore: remove duplicate package import #3775

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
817b06f
chore: remove duplicate package import
asttool Oct 10, 2025
981e94f
Merge branch 'master' into master
j0sh Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions server/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/livepeer/go-livepeer/eth"
"github.com/livepeer/go-livepeer/eth/types"
"github.com/livepeer/go-livepeer/net"
lpnet "github.com/livepeer/go-livepeer/net"
"github.com/livepeer/go-livepeer/pm"
"github.com/livepeer/lpms/ffmpeg"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -397,21 +396,21 @@ func TestGetNetworkCapabilitiesHandler(t *testing.T) {
assert := assert.New(t)

// setup orchestrator remote info to include in db
var capPrices []*lpnet.PriceInfo
capPrice := &lpnet.PriceInfo{Capability: uint32(core.Capability_ImageToVideo), Constraint: "livepeer/model1", PricePerUnit: 2, PixelsPerUnit: 1}
var capPrices []*net.PriceInfo
capPrice := &net.PriceInfo{Capability: uint32(core.Capability_ImageToVideo), Constraint: "livepeer/model1", PricePerUnit: 2, PixelsPerUnit: 1}
capPrices = append(capPrices, capPrice)
wkrHdw := net.HardwareInformation{
Pipeline: "32",
ModelId: "livepeer/model1",
GpuInfo: make(map[string]*lpnet.GPUComputeInfo),
GpuInfo: make(map[string]*net.GPUComputeInfo),
}
wkrHdw.GpuInfo["0"] = &lpnet.GPUComputeInfo{
wkrHdw.GpuInfo["0"] = &net.GPUComputeInfo{
Id: "gpu-2",
Name: "gpu-name",
Major: 8,
Minor: 9,
}
var hdwList []*lpnet.HardwareInformation
var hdwList []*net.HardwareInformation
hdwList = append(hdwList, &wkrHdw)
caps := newAICapabilities(core.Capability_ImageToVideo, "livepeer/model1", true, &core.Capabilities{})
orchAddress := pm.RandAddress()
Expand Down
Loading