Skip to content
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

chore: Update dependencies #539

Merged
merged 3 commits into from
Dec 19, 2024
Merged

chore: Update dependencies #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
048fcb0
build: update dependencies
n8maninger Dec 19, 2024
ccea311
e2e: use token helper in rhp4 integration tests
n8maninger Dec 19, 2024
c565158
refactor: increase prune interval in testing
n8maninger Dec 19, 2024
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
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ require (
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/mattn/go-sqlite3 v1.14.24
github.com/shopspring/decimal v1.4.0
go.sia.tech/core v0.8.0
go.sia.tech/coreutils v0.8.0
go.sia.tech/core v0.9.0
go.sia.tech/coreutils v0.9.0
go.sia.tech/jape v0.12.1
go.sia.tech/mux v1.3.0
go.sia.tech/web/hostd v0.53.0
go.sia.tech/web/hostd v0.53.1
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.28.0
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
go.sia.tech/core v0.8.0 h1:J6vZQlVhpj4bTVeuC2GKkfkGEs8jf0j651Kl1wwOxjg=
go.sia.tech/core v0.8.0/go.mod h1:Wj1qzvpMM2rqEQjwWJEbCBbe9VWX/mSJUu2Y2ABl1QA=
go.sia.tech/coreutils v0.8.0 h1:1dcl0vxY+MBgAdJ7PdewAr8RkZJn4/6wAKEZfi4iYn0=
go.sia.tech/coreutils v0.8.0/go.mod h1:ml5MefDMWCvPKNeRVIGHmyF5tv27C9h1PiI/iOiTGLg=
go.sia.tech/core v0.9.0 h1:qV7V8nkNaPvBEhkbwgrETTkb7JCMcAnKUQt9nUumP4k=
go.sia.tech/core v0.9.0/go.mod h1:3NAvYHuzAZg9vP6pyIMOxjTkgHBQ3vx9cXTqRF6oEa4=
go.sia.tech/coreutils v0.9.0 h1:5cnK0RtHOyErGhcmNkmCdEKeuj1tECwO9PYbErEbpDQ=
go.sia.tech/coreutils v0.9.0/go.mod h1:KFq1q5/YbPH6ZSWtXCxA1bRhBF5Zgcj8G3Wvu0jr/BA=
go.sia.tech/jape v0.12.1 h1:xr+o9V8FO8ScRqbSaqYf9bjj1UJ2eipZuNcI1nYousU=
go.sia.tech/jape v0.12.1/go.mod h1:wU+h6Wh5olDjkPXjF0tbZ1GDgoZ6VTi4naFw91yyWC4=
go.sia.tech/mux v1.3.0 h1:hgR34IEkqvfBKUJkAzGi31OADeW2y7D6Bmy/Jcbop9c=
go.sia.tech/mux v1.3.0/go.mod h1:I46++RD4beqA3cW9Xm9SwXbezwPqLvHhVs9HLpDtt58=
go.sia.tech/web v0.0.0-20240610131903-5611d44a533e h1:oKDz6rUExM4a4o6n/EXDppsEka2y/+/PgFOZmHWQRSI=
go.sia.tech/web v0.0.0-20240610131903-5611d44a533e/go.mod h1:4nyDlycPKxTlCqvOeRO0wUfXxyzWCEE7+2BRrdNqvWk=
go.sia.tech/web/hostd v0.53.0 h1:DuoQilaRcbb/E1ZNrQ7iXzNanovzcGtihKFW7Zb0aDI=
go.sia.tech/web/hostd v0.53.0/go.mod h1:qU1Q738uhMjYd78XoySYp5iui7qxhsncBZnJ+KfM8fw=
go.sia.tech/web/hostd v0.53.1 h1:OKS0bkrl1JEP7mmnQq3z1iJJBZDWMlBs1oxZbkuQJl4=
go.sia.tech/web/hostd v0.53.1/go.mod h1:qU1Q738uhMjYd78XoySYp5iui7qxhsncBZnJ+KfM8fw=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
Expand Down
78 changes: 11 additions & 67 deletions internal/integration/rhp/v4/rhp4_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,7 @@ func TestRPCRefresh(t *testing.T) {
revision.Revision = fundResult.Revision

// upload data
at := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(5 * time.Minute),
}
at.Signature = renterKey.SignHash(at.SigHash())
at := account.Token(renterKey, hostKey.PublicKey())
wRes, err := rhp4.RPCWriteSector(context.Background(), transport, settings.Prices, at, bytes.NewReader(bytes.Repeat([]byte{1}, proto4.LeafSize)), proto4.LeafSize)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -356,10 +352,7 @@ func TestRPCRenew(t *testing.T) {
revision.Revision = fundResult.Revision

// upload data
at := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(5 * time.Minute),
}
at := account.Token(renterKey, hostKey.PublicKey())
at.Signature = renterKey.SignHash(at.SigHash())
wRes, err := rhp4.RPCWriteSector(context.Background(), transport, settings.Prices, at, bytes.NewReader(bytes.Repeat([]byte{1}, proto4.LeafSize)), proto4.LeafSize)
if err != nil {
Expand Down Expand Up @@ -642,13 +635,7 @@ func TestReadWriteSector(t *testing.T) {
}
revision.Revision = fundResult.Revision

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
tokenSigHash := token.SigHash()
token.Signature = renterKey.SignHash(tokenSigHash)

token := account.Token(renterKey, hostKey.PublicKey())
data := frand.Bytes(1024)

// store the sector
Expand Down Expand Up @@ -749,13 +736,7 @@ func TestAppendSectors(t *testing.T) {
revision.Revision = fundResult.Revision
assertLastRevision(t)

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
tokenSigHash := token.SigHash()
token.Signature = renterKey.SignHash(tokenSigHash)

token := account.Token(renterKey, hostKey.PublicKey())
// store random sectors
roots := make([]types.Hash256, 0, 10)
for i := 0; i < 10; i++ {
Expand Down Expand Up @@ -854,13 +835,7 @@ func TestVerifySector(t *testing.T) {
}
revision.Revision = fundResult.Revision

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
tokenSigHash := token.SigHash()
token.Signature = renterKey.SignHash(tokenSigHash)

token := account.Token(renterKey, hostKey.PublicKey())
data := frand.Bytes(1024)

// store the sector
Expand Down Expand Up @@ -932,14 +907,7 @@ func TestRPCFreeSectors(t *testing.T) {
t.Fatal(err)
}
revision.Revision = fundResult.Revision

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
tokenSigHash := token.SigHash()
token.Signature = renterKey.SignHash(tokenSigHash)

token := account.Token(renterKey, hostKey.PublicKey())
roots := make([]types.Hash256, 10)
for i := range roots {
// store random sectors on the host
Expand Down Expand Up @@ -1042,13 +1010,7 @@ func TestRPCSectorRoots(t *testing.T) {
}
revision.Revision = fundResult.Revision

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
tokenSigHash := token.SigHash()
token.Signature = renterKey.SignHash(tokenSigHash)

token := account.Token(renterKey, hostKey.PublicKey())
roots := make([]types.Hash256, 0, 50)

checkRoots := func(t *testing.T, expected []types.Hash256) {
Expand Down Expand Up @@ -1138,13 +1100,7 @@ func TestPrune(t *testing.T) {
}
revision.Revision = fundResult.Revision

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
tokenSigHash := token.SigHash()
token.Signature = renterKey.SignHash(tokenSigHash)

token := account.Token(renterKey, hostKey.PublicKey())
tempExpirationHeight := cm.Tip().Height + proto4.TempSectorDuration
roots := make([]types.Hash256, 10)
for i := 0; i < len(roots); i++ {
Expand Down Expand Up @@ -1255,11 +1211,7 @@ func BenchmarkWrite(b *testing.B) {
}
revision.Revision = fundResult.Revision

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
token.Signature = renterKey.SignHash(token.SigHash())
token := account.Token(renterKey, hostKey.PublicKey())

var sectors [][proto4.SectorSize]byte
for i := 0; i < b.N; i++ {
Expand Down Expand Up @@ -1331,11 +1283,7 @@ func BenchmarkRead(b *testing.B) {
}
revision.Revision = fundResult.Revision

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
token.Signature = renterKey.SignHash(token.SigHash())
token := account.Token(renterKey, hostKey.PublicKey())

var sectors [][proto4.SectorSize]byte
roots := make([]types.Hash256, 0, b.N)
Expand Down Expand Up @@ -1419,11 +1367,7 @@ func BenchmarkContractUpload(b *testing.B) {
}
revision.Revision = fundResult.Revision

token := proto4.AccountToken{
Account: account,
ValidUntil: time.Now().Add(time.Hour),
}
token.Signature = renterKey.SignHash(token.SigHash())
token := account.Token(renterKey, hostKey.PublicKey())

var sectors [][proto4.SectorSize]byte
roots := make([]types.Hash256, 0, b.N)
Expand Down
2 changes: 1 addition & 1 deletion internal/testutil/testutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func NewHostNode(t testing.TB, pk types.PrivateKey, network *consensus.Network,
}
t.Cleanup(func() { wm.Close() })

vm, err := storage.NewVolumeManager(cn.Store, storage.WithLogger(log.Named("storage")), storage.WithPruneInterval(time.Second))
vm, err := storage.NewVolumeManager(cn.Store, storage.WithLogger(log.Named("storage")), storage.WithPruneInterval(30*time.Second))
if err != nil {
t.Fatal("failed to create volume manager:", err)
}
Expand Down
Loading