Introduce MspEndorser (hyperledger#201)

#### Type of change

- Improvement (improvement to code, performance, etc)
 
#### Description

- Introduce `MspEndorser` to endorser transactions using a local MSP
- Refactor sigtest and the loadgen to apply the "endorsement"
terminology
   - Endorser -> creates endorsement protobuf
   - Signer -> creates a binary signature
-  Fix issues from previous PRs

#### Related issues

- required for hyperledger#188

---------

Signed-off-by: Liran Funaro <liran.funaro@gmail.com>

Author: liran-funaro

cmd/config/app_config_test.go

@@ -382,7 +382,7 @@ func TestReadConfigLoadGen(t *testing.T) {
 					Policy: &workload.PolicyProfile{
 						ChannelID: "mychannel",
 						NamespacePolicies: map[string]*workload.Policy{
-							workload.GeneratedNamespaceID: {
+							workload.DefaultGeneratedNamespaceID: {
 								Scheme: signature.Ecdsa, Seed: 10,
 							},
 							committerpb.MetaNamespaceID: {

go.sum

@@ -918,10 +918,6 @@ github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5 h1:RPW
 github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5/go.mod h1:SHNCq8AB0VpHAmvJEtdbzabv6NNV1F48JdmDihasBjc=
 github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7 h1:sQ5qv8vQQfwewa1JlCiSCC8dLElmaU2/frLolpgibEY=
 github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7/go.mod h1:bJnwzfv03oZQeCc863pdGTDgf5nmCy6Za3RAE7d2XsQ=
-github.com/hyperledger/fabric-x-common v0.0.0-20251202124918-fc1bdd9f047a h1:6FKsx199DERm0lfSdzzExMPWrKRQic85y6gv9bDJLn4=
-github.com/hyperledger/fabric-x-common v0.0.0-20251202124918-fc1bdd9f047a/go.mod h1:7u/Yz8y3/88VX2JmqSOr2YVKm6qDtLbFc8PGZimP3V4=
-github.com/hyperledger/fabric-x-common v0.0.0-20251210111950-8c4f7df01875 h1:WsRxbhGgMXvduVIMn7Um5jqp9LRVLqLZo+Tbj0vhY4o=
-github.com/hyperledger/fabric-x-common v0.0.0-20251210111950-8c4f7df01875/go.mod h1:EDNayd2HEao22yv6ThvWfDKT2+cIR0Qplq3E/lgWwpA=
 github.com/hyperledger/fabric-x-common v0.0.0-20251211114026-4c950db7778e h1:5eDnbhRxekkH3l7w1xHmxW9m48HUSlzke+ZHRlm/PeM=
 github.com/hyperledger/fabric-x-common v0.0.0-20251211114026-4c950db7778e/go.mod h1:EDNayd2HEao22yv6ThvWfDKT2+cIR0Qplq3E/lgWwpA=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=

integration/runner/runtime.go

@@ -38,7 +38,6 @@ import (
 	"github.com/hyperledger/fabric-x-committer/utils/signature"
 	"github.com/hyperledger/fabric-x-committer/utils/signature/sigtest"
 	"github.com/hyperledger/fabric-x-committer/utils/test"
-	"github.com/hyperledger/fabric-x-committer/utils/test/apptest"
 )
 
 type (
@@ -75,16 +74,6 @@ type (
 		CredFactory *test.CredentialsFactory
 	}
 
-	// Crypto holds crypto material for a namespace.
-	Crypto struct {
-		Namespace  string
-		Profile    *workload.Policy
-		HashSigner *workload.PolicySignerVerifier
-		NsSigner   *sigtest.NsSigner
-		PubKey     []byte
-		PubKeyPath string
-	}
-
 	// Config represents the runtime configuration.
 	Config struct {
 		NumVerifiers      int
@@ -154,7 +143,7 @@ func NewRuntime(t *testing.T, conf *Config) *CommitterRuntime {
 		CommittedBlock:   make(chan *common.Block, 100),
 		seedForCryptoGen: rand.New(rand.NewSource(10)),
 	}
-	c.AddOrUpdateNamespaces(t, committerpb.MetaNamespaceID, workload.GeneratedNamespaceID, "1", "2", "3")
+	c.AddOrUpdateNamespaces(t, committerpb.MetaNamespaceID, workload.DefaultGeneratedNamespaceID, "1", "2", "3")
 
 	t.Log("Making DB env")
 	if conf.DBConnection == nil {
@@ -406,7 +395,7 @@ func (c *CommitterRuntime) MakeAndSendTransactionsToOrderer(
 		if expectedStatus != nil && expectedStatus[i] == applicationpb.Status_ABORTED_SIGNATURE_INVALID {
 			tx.Endorsements = make([]*applicationpb.Endorsements, len(namespaces))
 			for nsIdx := range namespaces {
-				tx.Endorsements[nsIdx] = apptest.CreateEndorsementsForThresholdRule([]byte("dummy"))[0]
+				tx.Endorsements[nsIdx] = sigtest.CreateEndorsementsForThresholdRule([]byte("dummy"))[0]
 			}
 		}
 		txs[i] = c.TxBuilder.MakeTx(tx)
@@ -525,7 +514,7 @@ func (c *CommitterRuntime) ValidateExpectedResultsInCommittedBlock(t *testing.T,
 
 	ctx, cancel := context.WithTimeout(t.Context(), 1*time.Minute)
 	defer cancel()
-	apptest.EnsurePersistedTxStatus(ctx, t, c.CoordinatorClient, persistedTxIDs, persistedTxIDsStatus)
+	test.EnsurePersistedTxStatus(ctx, t, c.CoordinatorClient, persistedTxIDs, persistedTxIDsStatus)
 
 	if len(expected.TxIDs) == 0 || c.config.CrashTest {
 		return

integration/test/config_update_test.go

@@ -86,7 +86,7 @@ func TestConfigUpdate(t *testing.T) {
 	lgMetaTx := c.TxBuilder.MakeTx(metaTx)
 
 	c.AddOrUpdateNamespaces(t, committerpb.MetaNamespaceID)
-	metaPolicy := c.TxBuilder.TxSigner.Policy(committerpb.MetaNamespaceID).VerificationPolicy()
+	metaPolicy := c.TxBuilder.TxEndorser.Policy(committerpb.MetaNamespaceID).VerificationPolicy()
 	submitConfigBlock := func(endpoints []*commontypes.OrdererEndpoint) {
 		ordererEnv.SubmitConfigBlock(t, &workload.ConfigBlock{
 			ChannelID:                    c.SystemConfig.Policy.ChannelID,

integration/test/namespace_lifecycle_test.go

@@ -29,9 +29,9 @@ func TestCreateUpdateNamespace(t *testing.T) {
 	})
 	c.Start(t, runner.FullTxPath)
 
-	policyBytesNs1, err := proto.Marshal(c.TxBuilder.TxSigner.Policy("1").VerificationPolicy())
+	policyBytesNs1, err := proto.Marshal(c.TxBuilder.TxEndorser.Policy("1").VerificationPolicy())
 	require.NoError(t, err)
-	policyBytesNs2, err := proto.Marshal(c.TxBuilder.TxSigner.Policy("2").VerificationPolicy())
+	policyBytesNs2, err := proto.Marshal(c.TxBuilder.TxEndorser.Policy("2").VerificationPolicy())
 	require.NoError(t, err)
 
 	tests := []struct {

loadgen/adapters/sigverifier.go

@@ -82,7 +82,7 @@ func (c *SvAdapter) RunWorkload(ctx context.Context, txStream *workload.StreamWi
 }
 
 func createUpdate(policy *workload.PolicyProfile) (*servicepb.VerifierUpdates, error) {
-	txSigner := workload.NewTxSignerVerifier(policy)
+	txEndorser := workload.NewTxEndorserVerifier(policy)
 
 	envelopeBytes, err := workload.CreateConfigEnvelope(policy)
 	if err != nil {
@@ -93,15 +93,15 @@ func createUpdate(policy *workload.PolicyProfile) (*servicepb.VerifierUpdates, e
 			Envelope: envelopeBytes,
 		},
 		NamespacePolicies: &applicationpb.NamespacePolicies{
-			Policies: make([]*applicationpb.PolicyItem, 0, len(txSigner.AllNamespaces())),
+			Policies: make([]*applicationpb.PolicyItem, 0, len(txEndorser.AllNamespaces())),
 		},
 	}
 
-	for _, ns := range txSigner.AllNamespaces() {
+	for _, ns := range txEndorser.AllNamespaces() {
 		if ns == committerpb.MetaNamespaceID {
 			continue
 		}
-		policyBytes, err := proto.Marshal(txSigner.Policy(ns).VerificationPolicy())
+		policyBytes, err := proto.Marshal(txEndorser.Policy(ns).VerificationPolicy())
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to serialize policy")
 		}

loadgen/client_test_utils.go

@@ -51,7 +51,7 @@ func DefaultClientConf() *ClientConfig {
 				ReadWriteCount: workload.NewConstantDistribution(2),
 				Policy: &workload.PolicyProfile{
 					NamespacePolicies: map[string]*workload.Policy{
-						workload.GeneratedNamespaceID: {
+						workload.DefaultGeneratedNamespaceID: {
 							Scheme: signature.Ecdsa,
 							Seed:   10,
 						},

loadgen/workload/config_tx.go

@@ -85,8 +85,8 @@ func CreateConfigBlock(policy *PolicyProfile) (*common.Block, error) {
 		return block, nil
 	}
 
-	txSigner := NewTxSignerVerifier(policy)
-	metaPolicy := txSigner.Policy(committerpb.MetaNamespaceID)
+	txEndorser := NewTxEndorserVerifier(policy)
+	metaPolicy := txEndorser.Policy(committerpb.MetaNamespaceID)
 	return CreateDefaultConfigBlock(&ConfigBlock{
 		MetaNamespaceVerificationKey: metaPolicy.VerificationPolicy().GetThresholdRule().GetPublicKey(),
 		OrdererEndpoints:             policy.OrdererEndpoints,
@@ -103,11 +103,13 @@ func CreateDefaultConfigBlock(conf *ConfigBlock, profileName string) (*common.Bl
 	defer func() {
 		_ = os.RemoveAll(target)
 	}()
-	return CreateConfigBlockWithCrypto(target, conf, profileName)
+	return CreateDefaultConfigBlockWithCrypto(target, conf, profileName)
 }
 
-// CreateConfigBlockWithCrypto creates a config block with crypto material.
-func CreateConfigBlockWithCrypto(targetPath string, conf *ConfigBlock, profileName string) (*common.Block, error) {
+// CreateDefaultConfigBlockWithCrypto creates a config block with crypto material.
+func CreateDefaultConfigBlockWithCrypto(
+	targetPath string, conf *ConfigBlock, profileName string,
+) (*common.Block, error) {
 	orgs := make([]cryptogen.OrganizationParameters, 0, int(conf.PeerOrganizationCount)+len(conf.OrdererEndpoints))
 
 	ordererOrgsMap := make(map[uint32][]cryptogen.OrdererEndpoint)
@@ -151,7 +153,7 @@ func CreateConfigBlockWithCrypto(targetPath string, conf *ConfigBlock, profileNa
 	metaKey := conf.MetaNamespaceVerificationKey
 	if len(metaKey) == 0 {
 		// We must supply a valid meta namespace key.
-		_, metaKey = sigtest.NewSignatureFactory(signature.Ecdsa).NewKeys()
+		_, metaKey = sigtest.NewKeyPair(signature.Ecdsa)
 	}
 
 	return cryptogen.CreateDefaultConfigBlockWithCrypto(cryptogen.ConfigBlockParameters{

loadgen/workload/conflicts.go

@@ -11,7 +11,7 @@ import (
 	"math/rand"
 
 	"github.com/hyperledger/fabric-x-committer/api/applicationpb"
-	"github.com/hyperledger/fabric-x-committer/utils/test/apptest"
+	"github.com/hyperledger/fabric-x-committer/utils/signature/sigtest"
 )
 
 // Dependency types.
@@ -64,7 +64,7 @@ func (g *signTxModifier) Modify(tx *applicationpb.Tx) {
 		// Pre-assigning prevents TxBuilder from re-signing the TX.
 		tx.Endorsements = make([]*applicationpb.Endorsements, len(tx.Namespaces))
 		for i := range len(tx.Namespaces) {
-			tx.Endorsements[i] = apptest.CreateEndorsementsForThresholdRule(g.invalidSignature)[0]
+			tx.Endorsements[i] = sigtest.CreateEndorsementsForThresholdRule(g.invalidSignature)[0]
 		}
 	}
 }

loadgen/workload/namespace.go

@@ -21,7 +21,7 @@ func CreateLoadGenNamespacesTX(policy *PolicyProfile) (*servicepb.LoadGenTx, err
 	if txbErr != nil {
 		return nil, txbErr
 	}
-	tx, err := CreateNamespacesTxFromSigner(txb.TxSigner, 0)
+	tx, err := CreateNamespacesTxFromEndorser(txb.TxEndorser, 0)
 	if err != nil {
 		return nil, err
 	}
@@ -32,24 +32,24 @@ func CreateLoadGenNamespacesTX(policy *PolicyProfile) (*servicepb.LoadGenTx, err
 func CreateNamespacesTX(
 	policy *PolicyProfile, metaNamespaceVersion uint64, includeNS ...string,
 ) (*applicationpb.Tx, error) {
-	signer := NewTxSignerVerifier(policy)
-	return CreateNamespacesTxFromSigner(signer, metaNamespaceVersion, includeNS...)
+	endorser := NewTxEndorserVerifier(policy)
+	return CreateNamespacesTxFromEndorser(endorser, metaNamespaceVersion, includeNS...)
 }
 
-// CreateNamespacesTxFromSigner creating the transaction containing the requested namespaces into the MetaNamespace.
-func CreateNamespacesTxFromSigner(
-	signer *TxSignerVerifier, metaNamespaceVersion uint64, includeNS ...string,
+// CreateNamespacesTxFromEndorser creating the transaction containing the requested namespaces into the MetaNamespace.
+func CreateNamespacesTxFromEndorser(
+	endorser *TxEndorserVerifier, metaNamespaceVersion uint64, includeNS ...string,
 ) (*applicationpb.Tx, error) {
 	if len(includeNS) == 0 {
-		includeNS = signer.AllNamespaces()
+		includeNS = endorser.AllNamespaces()
 	}
 
 	readWrites := make([]*applicationpb.ReadWrite, 0, len(includeNS))
 	for _, ns := range includeNS {
 		if ns == committerpb.MetaNamespaceID {
 			continue
 		}
-		policyBytes, err := proto.Marshal(signer.Policy(ns).VerificationPolicy())
+		policyBytes, err := proto.Marshal(endorser.Policy(ns).VerificationPolicy())
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to serialize namespace policy")
 		}