[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 (
@@ -26,3 +27,31 @@
 }
 
 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("\n configured poets:\n")
+	for _, p := range e.configuredPoets {
+		sb.WriteString("\t")
+		sb.WriteString(p)
+		sb.WriteString("\n")
+	}
+	return sb.String()
+}
+
+func (e *PoetRegistrationMismatchError) As(target error) bool {
+	var poetRegistrationMismatchError *PoetRegistrationMismatchError
+	return errors.As(target, &poetRegistrationMismatchError)
+}

activation/e2e/poet_client.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net/url"
 	"strconv"
 	"sync"
 	"time"
@@ -66,8 +65,12 @@ func (p *TestPoet) Submit(
 	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 nil, errors.New("Info: not supported")
 }
 
 // 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")
 }