[Merged by Bors] - Simplify switch to different poet services

README.md

@@ -202,7 +202,7 @@ the build folder you need to ensure that you have the gpu setup dynamic library
 binary. The simplest way to do this is just copy the library file to be in the
 same directory as the go-spacemesh binary. Alternatively you can modify your
 system's library search paths (e.g. LD_LIBRARY_PATH) to ensure that the
-library is found._
+library is found.
 
 go-spacemesh is p2p software which is designed to form a decentralized network by connecting to other instances of
 go-spacemesh running on remote computers.

activation/activation_errors.go

@@ -3,6 +3,7 @@
 import (
 	"errors"
 	"fmt"
+	"strings"
 )
 
 var (
@@ -21,8 +22,31 @@
 	source error
 }
 
-func (e *PoetSvcUnstableError) Error() string {
+func (e PoetSvcUnstableError) Error() string {
 	return fmt.Sprintf("poet service is unstable: %s (%v)", e.msg, e.source)
 }
 
 func (e *PoetSvcUnstableError) Unwrap() error { return e.source }
+
+type PoetRegistrationMismatchError struct {
+	registrations   []string
+	configuredPoets []string
+}
+
+func (e PoetRegistrationMismatchError) Error() string {
+	var sb strings.Builder
+	sb.WriteString("builder: none of configured poets matches the existing registrations.\n")
+	sb.WriteString("registrations:\n")
+	for _, r := range e.registrations {
+		sb.WriteString("\t")
+		sb.WriteString(r)
+		sb.WriteString("\n")
+	}
+	sb.WriteString("\nconfigured poets:\n")
+	for _, p := range e.configuredPoets {
+		sb.WriteString("\t")
+		sb.WriteString(p)
+		sb.WriteString("\n")
+	}
+	return sb.String()
+}

activation/e2e/atx_merge_test.go

@@ -246,7 +246,7 @@ func Test_MarryAndMerge(t *testing.T) {
 		GracePeriod: epoch / 4,
 	}
 
-	client := ae2e.NewTestPoetClient(2)
+	client := ae2e.NewTestPoetClient(2, poetCfg)
 	poetSvc := activation.NewPoetServiceWithClient(poetDb, client, poetCfg, logger)
 
 	clock, err := timesync.NewClock(

activation/e2e/builds_atx_v2_test.go

@@ -92,7 +92,7 @@ func TestBuilder_SwitchesToBuildV2(t *testing.T) {
 	require.NoError(t, err)
 	t.Cleanup(clock.Close)
 
-	client := ae2e.NewTestPoetClient(1)
+	client := ae2e.NewTestPoetClient(1, poetCfg)
 	poetClient := activation.NewPoetServiceWithClient(poetDb, client, poetCfg, logger)
 
 	localDB := localsql.InMemory()

activation/e2e/checkpoint_merged_test.go

@@ -81,7 +81,7 @@ func Test_CheckpointAfterMerge(t *testing.T) {
 		GracePeriod: epoch / 4,
 	}
 
-	client := ae2e.NewTestPoetClient(2)
+	client := ae2e.NewTestPoetClient(2, poetCfg)
 	poetSvc := activation.NewPoetServiceWithClient(poetDb, client, poetCfg, logger)
 
 	clock, err := timesync.NewClock(

activation/e2e/checkpoint_test.go

@@ -71,7 +71,7 @@ func TestCheckpoint_PublishingSoloATXs(t *testing.T) {
 		CycleGap:    3 * epoch / 4,
 		GracePeriod: epoch / 4,
 	}
-	client := ae2e.NewTestPoetClient(1)
+	client := ae2e.NewTestPoetClient(1, poetCfg)
 	poetService := activation.NewPoetServiceWithClient(poetDb, client, poetCfg, logger)
 
 	// ensure that genesis aligns with layer timings

activation/e2e/nipost_test.go

@@ -198,7 +198,7 @@ func TestNIPostBuilderWithClients(t *testing.T) {
 	err = nipost.AddPost(localDb, sig.NodeID(), *fullPost(post, info, shared.ZeroChallenge))
 	require.NoError(t, err)
 
-	client := ae2e.NewTestPoetClient(1)
+	client := ae2e.NewTestPoetClient(1, poetCfg)
 	poetService := activation.NewPoetServiceWithClient(poetDb, client, poetCfg, logger)
 
 	localDB := localsql.InMemory()
@@ -272,7 +272,7 @@ func Test_NIPostBuilderWithMultipleClients(t *testing.T) {
 	}
 
 	poetDb := activation.NewPoetDb(db, logger.Named("poetDb"))
-	client := ae2e.NewTestPoetClient(len(signers))
+	client := ae2e.NewTestPoetClient(len(signers), poetCfg)
 	poetService := activation.NewPoetServiceWithClient(poetDb, client, poetCfg, logger)
 
 	mclock := activation.NewMocklayerClock(ctrl)

activation/e2e/poet_client.go

@@ -4,7 +4,6 @@
 	"context"
 	"errors"
 	"fmt"
-	"net/url"
 	"strconv"
 	"sync"
 	"time"
@@ -20,15 +19,17 @@
 )
 
 type TestPoet struct {
-	mu    sync.Mutex
-	round int
+	mu      sync.Mutex
+	round   int
+	poetCfg activation.PoetConfig
 
 	expectedMembers int
 	registrations   chan []byte
 }
 
-func NewTestPoetClient(expectedMembers int) *TestPoet {
+func NewTestPoetClient(expectedMembers int, poetCfg activation.PoetConfig) *TestPoet {
 	return &TestPoet{
+		poetCfg:         poetCfg,
 		expectedMembers: expectedMembers,
 		registrations:   make(chan []byte, expectedMembers),
 	}
@@ -66,8 +67,15 @@
 	return &types.PoetRound{ID: strconv.Itoa(round), End: time.Now()}, nil
 }
 
-func (p *TestPoet) CertifierInfo(ctx context.Context) (*url.URL, []byte, error) {
-	return nil, nil, errors.New("not supported")
+func (p *TestPoet) CertifierInfo(ctx context.Context) (*types.CertifierInfo, error) {
+	return nil, errors.New("CertifierInfo: not supported")
+}
+
+func (p *TestPoet) Info(ctx context.Context) (*types.PoetInfo, error) {
+	return &types.PoetInfo{
+		PhaseShift: p.poetCfg.PhaseShift,
+		CycleGap:   p.poetCfg.CycleGap,
+	}, nil
 }
 
 // Build a proof.

activation/e2e/poet_test.go

@@ -259,10 +259,10 @@ func TestCertifierInfo(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	url, pubkey, err := client.CertifierInfo(context.Background())
+	certInfo, err := client.CertifierInfo(context.Background())
 	r.NoError(err)
-	r.Equal("http://localhost:8080", url.String())
-	r.Equal([]byte("pubkey"), pubkey)
+	r.Equal("http://localhost:8080", certInfo.Url.String())
+	r.Equal([]byte("pubkey"), certInfo.Pubkey)
 }
 
 func TestNoCertifierInfo(t *testing.T) {
@@ -291,6 +291,6 @@ func TestNoCertifierInfo(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	_, _, err = client.CertifierInfo(context.Background())
+	_, err = client.CertifierInfo(context.Background())
 	r.ErrorContains(err, "poet doesn't support certificates")
 }

activation/e2e/validation_test.go

@@ -51,7 +51,7 @@ func TestValidator_Validate(t *testing.T) {
 	}
 
 	poetDb := activation.NewPoetDb(sql.InMemory(), logger.Named("poetDb"))
-	client := ae2e.NewTestPoetClient(1)
+	client := ae2e.NewTestPoetClient(1, poetCfg)
 	poetService := activation.NewPoetServiceWithClient(poetDb, client, poetCfg, logger)
 
 	mclock := activation.NewMocklayerClock(ctrl)