Add validation utility to LocalNoncePool for configuration enforcement

Author: Jeff Yanta

pkg/code/async/sequencer/service.go

@@ -37,15 +37,8 @@ type service struct {
 }
 
 func New(data code_data.Provider, scheduler Scheduler, vmIndexerClient indexerpb.IndexerClient, noncePool *transaction.LocalNoncePool, configProvider ConfigProvider) (async.Service, error) {
-	noncePoolEnv, noncePoolEnvInstance, noncePoolType := noncePool.GetConfiguration()
-	if noncePoolEnv != nonce.EnvironmentSolana {
-		return nil, errors.Errorf("nonce pool environment must be %s", nonce.EnvironmentSolana)
-	}
-	if noncePoolEnvInstance != nonce.EnvironmentInstanceSolanaMainnet {
-		return nil, errors.Errorf("nonce pool environment instance must be %s", nonce.EnvironmentInstanceSolanaMainnet)
-	}
-	if noncePoolType != nonce.PurposeOnDemandTransaction {
-		return nil, errors.Errorf("nonce pool type must be %s", nonce.PurposeOnDemandTransaction)
+	if err := noncePool.Validate(nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeOnDemandTransaction); err != nil {
+		return nil, err
 	}
 
 	return &service{

pkg/code/server/transaction/server.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"sync"
 
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
 	transactionpb "github.com/code-payments/code-protobuf-api/generated/go/transaction/v2"
@@ -67,15 +66,8 @@ func NewTransactionServer(
 
 	stripedLockParallelization := uint(conf.stripedLockParallelization.Get(ctx))
 
-	noncePoolEnv, noncePoolEnvInstance, noncePoolType := noncePool.GetConfiguration()
-	if noncePoolEnv != nonce.EnvironmentCvm {
-		return nil, errors.Errorf("nonce pool environment must be %s", nonce.EnvironmentCvm)
-	}
-	if noncePoolEnvInstance != common.CodeVmAccount.PublicKey().ToBase58() {
-		return nil, errors.Errorf("nonce pool environment instance must be %s", common.CodeVmAccount.PublicKey().ToBase58())
-	}
-	if noncePoolType != nonce.PurposeClientTransaction {
-		return nil, errors.Errorf("nonce pool type must be %s", nonce.PurposeClientTransaction)
+	if err := noncePool.Validate(nonce.EnvironmentCvm, common.CodeVmAccount.PublicKey().ToBase58(), nonce.PurposeClientTransaction); err != nil {
+		return nil, err
 	}
 
 	s := &transactionServer{

pkg/code/transaction/nonce_pool.go

@@ -323,8 +323,21 @@ func (np *LocalNoncePool) GetNonce(ctx context.Context) (*Nonce, error) {
 	return n, nil
 }
 
-func (np *LocalNoncePool) GetConfiguration() (nonce.Environment, string, nonce.Purpose) {
-	return np.env, np.envInstance, np.poolType
+func (np *LocalNoncePool) Validate(
+	env nonce.Environment,
+	envInstance string,
+	poolType nonce.Purpose,
+) error {
+	if np.env != env {
+		return errors.Errorf("nonce pool environment must be %s", env)
+	}
+	if np.envInstance != envInstance {
+		return errors.Errorf("nonce pool environment instance must be %s", envInstance)
+	}
+	if np.poolType != poolType {
+		return errors.Errorf("nonce pool type must be %s", poolType)
+	}
+	return nil
 }
 
 func (np *LocalNoncePool) Close() error {