Skip to content

Commit

Permalink
build(deps): Bump github.com/spacemeshos/poet from 0.10.4 to 0.10.10 (#…
Browse files Browse the repository at this point in the history
…6461)

Co-authored-by: Matthias <[email protected]>
  • Loading branch information
dependabot[bot] and fasmat committed Nov 15, 2024
1 parent c276056 commit 0f568d2
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 24 deletions.
5 changes: 3 additions & 2 deletions activation/e2e/poet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,12 @@ func WithCertifier(certifier *registration.CertifierConfig) HTTPPoetOpt {
}

// NewHTTPPoetTestHarness returns a new instance of HTTPPoetHarness.
func NewHTTPPoetTestHarness(ctx context.Context, poetdir string, opts ...HTTPPoetOpt) (*HTTPPoetTestHarness, error) {
func NewHTTPPoetTestHarness(ctx context.Context, poetDir string, opts ...HTTPPoetOpt) (*HTTPPoetTestHarness, error) {
cfg := server.DefaultConfig()
cfg.PoetDir = poetdir
cfg.PoetDir = poetDir
cfg.RawRESTListener = "localhost:0"
cfg.RawRPCListener = "localhost:0"
cfg.ConfigRPCListener = "localhost:0"

for _, opt := range opts {
opt(cfg)
Expand Down
2 changes: 1 addition & 1 deletion activation/handler_v2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@ func TestHandlerV2_ProcessMergedATX(t *testing.T) {
require.NoError(t, err)
})
t.Run("publishing two merged ATXs (one checkpointed)", func(t *testing.T) {
t.Skip("syntactically validating double merge where one ATX is checkpointed isn't implemented yet")
atxHandler := newV2TestHandler(t, golden)

mATX, otherATXs := marryIDs(t, atxHandler, signers, golden)
Expand Down Expand Up @@ -1038,7 +1039,6 @@ func TestHandlerV2_ProcessMergedATX(t *testing.T) {

// This is syntactically invalid as all nodes in the network
// should already have the checkpointed merged ATX.
t.Skip("syntactically validating double merge where one ATX is checkpointed isn't implemented yet")
atxHandler.expectMergedAtxV2(merged, equivocationSet, []uint64{100})
err := atxHandler.processATX(context.Background(), "", merged, time.Now())
require.Error(t, err)
Expand Down
5 changes: 4 additions & 1 deletion common/types/address_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package types_test

import (
"os"
"testing"

"github.com/spacemeshos/go-scale/tester"
Expand All @@ -9,8 +10,10 @@ import (
"github.com/spacemeshos/go-spacemesh/common/types"
)

func init() {
func TestMain(m *testing.M) {
types.SetNetworkHRP("stest")
res := m.Run()
os.Exit(res)
}

func TestAddress_NewAddress(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ require (
github.com/spacemeshos/fixed v0.1.2
github.com/spacemeshos/go-scale v1.2.1
github.com/spacemeshos/merkle-tree v0.2.6
github.com/spacemeshos/poet v0.10.4
github.com/spacemeshos/poet v0.10.10
github.com/spacemeshos/post v0.12.10
github.com/spf13/afero v1.11.0
github.com/spf13/cobra v1.8.1
Expand Down Expand Up @@ -245,7 +245,7 @@ require (
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/api v0.203.0 // indirect
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -639,8 +639,8 @@ github.com/spacemeshos/go-scale v1.2.1 h1:+IJ6KmFl9tF1Om8B1NvEwilGpBG1ebr4Se8A0F
github.com/spacemeshos/go-scale v1.2.1/go.mod h1:fpO6tCoKdUmvF6o9zkUtq2erSOH5t4ik02Zwdm31qOs=
github.com/spacemeshos/merkle-tree v0.2.6 h1:PJ4LBx0vBbYVIHwApyjLy/yqUGEK35ggGTo05oiPhwg=
github.com/spacemeshos/merkle-tree v0.2.6/go.mod h1:lxMuC/C2qhN6wdH6iSXW0HM8FS6fnKnyLWjCAKsCtr8=
github.com/spacemeshos/poet v0.10.4 h1:MHGG1dhMVwy5DdlsmwdRLDQTTqlPA21lSQB2PVd8MSk=
github.com/spacemeshos/poet v0.10.4/go.mod h1:hz21GMyHb9h29CqNhVeKxCD5dxZdQK27nAqLpT46gjE=
github.com/spacemeshos/poet v0.10.10 h1:LgCQUjKvvuaoibH7nnNYehSF0yNR67eufwwqPBWb9Ts=
github.com/spacemeshos/poet v0.10.10/go.mod h1:6p+jNwqZOIWXvqdHEENfWZvwElIrw0HoxHIM1m4uDrk=
github.com/spacemeshos/post v0.12.10 h1:S4THKvy/uGdNzoZkTI5qqIo2H8/W4xktKtYzxKsYNVU=
github.com/spacemeshos/post v0.12.10/go.mod h1:oMoQ2oU5EXU1GsxK/kvhnc1/pRh8VYeRo/p8mMSsdHc=
github.com/spacemeshos/sha256-simd v0.1.0 h1:G7Mfu5RYdQiuE+wu4ZyJ7I0TI74uqLhFnKblEnSpjYI=
Expand Down Expand Up @@ -937,8 +937,8 @@ google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfG
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 h1:Df6WuGvthPzc+JiQ/G+m+sNX24kc0aTBqoDN/0yyykE=
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53/go.mod h1:fheguH3Am2dGp1LfXkrvwqC/KlFq8F0nLq3LryOMrrE=
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g=
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f h1:C1QccEa9kUwvMgEUORqQD9S17QesQijxjZ84sO82mfo=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
Expand Down
10 changes: 6 additions & 4 deletions mesh/ballotwriter/ballotwriter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"os"
"path/filepath"
"testing"
"time"
Expand All @@ -22,13 +23,14 @@ import (
"github.com/spacemeshos/go-spacemesh/sql/statesql"
)

func init() {
// otherwise we get a divide by zero error
var testLayer = types.LayerID(5)

func TestMain(m *testing.M) {
types.SetLayersPerEpoch(1)
res := m.Run()
os.Exit(res)
}

var testLayer = types.LayerID(5)

func TestWriteCoalesce_One(t *testing.T) {
w, db := newTestBallotWriter(t)
ballot := genBallot(t)
Expand Down
5 changes: 4 additions & 1 deletion syncer/atxsync/syncer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"os"
"testing"
"time"

Expand All @@ -23,8 +24,10 @@ import (
"github.com/spacemeshos/go-spacemesh/system"
)

func init() {
func TestMain(m *testing.M) {
types.SetLayersPerEpoch(10)
res := m.Run()
os.Exit(res)
}

func aid(id string) types.ATXID {
Expand Down
2 changes: 1 addition & 1 deletion systest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ test_name ?= TestSmeshing
org ?= spacemeshos
image_name ?= $(org)/systest:$(version_info)
certifier_image ?= $(org)/certifier-service:v0.7.13
poet_image ?= $(org)/poet:v0.10.3
poet_image ?= $(org)/poet:v0.10.10
post_service_image ?= $(org)/post-service:v0.7.13
post_init_image ?= $(org)/postcli:v0.12.5
smesher_image ?= $(org)/go-spacemesh-dev:$(version_info)
Expand Down
5 changes: 0 additions & 5 deletions systest/tests/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ import (
"github.com/spacemeshos/go-spacemesh/systest/testcontext"
)

func init() {
// systest runs with `fastnet` preset. this init need to generate addresses with same hrp network prefix as fastnet.
types.SetNetworkHRP("stest")
}

const (
attempts = 3
)
Expand Down
5 changes: 2 additions & 3 deletions systest/tests/distributed_post_verification_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,8 @@ func TestPostMalfeasanceProof(t *testing.T) {
require.NoError(t, err)
poetService, err := activation.NewPoetService(
poetDb,
types.PoetServer{
Address: cluster.MakePoetGlobalEndpoint(ctx.Namespace, 0),
}, cfg.POET,
types.PoetServer{Address: cluster.MakePoetGlobalEndpoint(ctx.Namespace, 0)},
cfg.POET,
logger,
1,
activation.WithCertifier(certifier),
Expand Down
8 changes: 8 additions & 0 deletions systest/tests/smeshing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"fmt"
"os"
"sort"
"testing"
"time"
Expand All @@ -28,6 +29,13 @@ import (
"github.com/spacemeshos/go-spacemesh/systest/testcontext"
)

func TestMain(m *testing.M) {
// systest runs with `fastnet` preset. this init need to generate addresses with same hrp network prefix as fastnet.
types.SetNetworkHRP("stest")
res := m.Run()
os.Exit(res)
}

// TestSmeshing tests the network is healthy, smeshers are creating proposals, transactions are processed, and vesting
// is working.
func TestSmeshing(t *testing.T) {
Expand Down

0 comments on commit 0f568d2

Please sign in to comment.