Merge branch 'hyperledger:main' into main

Author: iliecirciumaru

tools/fxconfig/internal/cli/v1/version.go

@@ -11,10 +11,9 @@ import (
 	"runtime"
 
 	"github.com/spf13/cobra"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
 
 	"github.com/hyperledger/fabric-x-common/common/metadata"
+	"github.com/hyperledger/fabric-x/tools/fxconfig/internal/cli/v1/cliio"
 )
 
 // NewVersionCommand returns a command that displays version information.
@@ -29,20 +28,15 @@ func NewVersionCommand() *cobra.Command {
   • Git commit SHA
   • Operating system and architecture`,
 		Run: func(cmd *cobra.Command, _ []string) {
-			// TODO: use printer
-			cmd.Printf("fxconfig\n")
-			showLine(cmd, "Version", metadata.Version)
-			showLine(cmd, "Go version", runtime.Version())
-			showLine(cmd, "Commit", metadata.CommitSHA)
-			showLine(cmd, "OS/Arch", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH))
+			osArch := fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)
+			p := cliio.NewCLIPrinter(cmd.OutOrStdout(), cmd.ErrOrStderr(), cliio.FormatTable)
+			p.Print("fxconfig\n")
+			p.Print(fmt.Sprintf(" %-16s %s\n", "Version:", metadata.Version))
+			p.Print(fmt.Sprintf(" %-16s %s\n", "Go Version:", runtime.Version()))
+			p.Print(fmt.Sprintf(" %-16s %s\n", "Commit:", metadata.CommitSHA))
+			p.Print(fmt.Sprintf(" %-16s %s\n", "OS/Arch:", osArch))
 		},
 	}
 
 	return cmd
 }
-
-// showLine formats and prints a single line of version information.
-// The title is capitalized and right-padded to 16 characters for alignment.
-func showLine(cmd *cobra.Command, title, value string) {
-	cmd.Printf(" %-16s %s\n", fmt.Sprintf("%s:", cases.Title(language.Und, cases.NoLower).String(title)), value)
-}

tools/fxconfig/internal/transaction/merge_test.go

@@ -108,6 +108,35 @@ func TestMerge_ErrorCases(t *testing.T) {
 		require.Nil(t, result)
 		require.Contains(t, err.Error(), "requires at least one endorsement")
 	})
+
+	t.Run("conflicting namespace writes", func(t *testing.T) {
+		t.Parallel()
+
+		tx1 := createTestTx([]string{"ns1"}, map[string][]string{"ns1": {"Org1MSP"}})
+		tx2 := createTestTx([]string{"ns1"}, map[string][]string{"ns1": {"Org2MSP"}})
+
+		tx1.Namespaces[0].ReadWrites = []*applicationpb.ReadWrite{{
+			Key:   []byte("asset-1"),
+			Value: []byte("value-a"),
+		}}
+		tx2.Namespaces[0].ReadWrites = []*applicationpb.ReadWrite{{
+			Key:   []byte("asset-1"),
+			Value: []byte("value-b"),
+		}}
+
+		result, err := Merge([]*applicationpb.Tx{tx1, tx2})
+		require.Error(t, err)
+		require.Nil(t, result)
+		require.Contains(t, err.Error(), "content mismatch")
+	})
+}
+
+func TestMerge_NilTransaction(t *testing.T) {
+	t.Parallel()
+
+	result, err := Merge([]*applicationpb.Tx{nil, nil})
+	require.Error(t, err)
+	require.Nil(t, result)
 }
 
 func TestMerge_SingleNamespace(t *testing.T) {
@@ -321,3 +350,33 @@ func TestMerge_PreservesTransactionContent(t *testing.T) {
 		require.Len(t, result.Endorsements[0].EndorsementsWithIdentity, 2)
 	})
 }
+
+func TestMerge_EmptyReadWriteSetIsValid(t *testing.T) {
+	t.Parallel()
+
+	tx1 := createTestTx([]string{"ns1"}, map[string][]string{"ns1": {"Org1MSP"}})
+	tx2 := createTestTx([]string{"ns1"}, map[string][]string{"ns1": {"Org2MSP"}})
+
+	result, err := Merge([]*applicationpb.Tx{tx1, tx2})
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Len(t, result.Namespaces, 1)
+	require.Empty(t, result.Namespaces[0].ReadWrites)
+	require.Len(t, result.Endorsements[0].EndorsementsWithIdentity, 2)
+}
+
+func TestMerge_DuplicateEndorsements(t *testing.T) {
+	t.Parallel()
+
+	tx1 := createTestTx([]string{"ns1"}, map[string][]string{"ns1": {"Org1MSP", "Org1MSP", "Org2MSP"}})
+	tx2 := createTestTx([]string{"ns1"}, map[string][]string{"ns1": {"Org2MSP", "Org3MSP"}})
+
+	result, err := Merge([]*applicationpb.Tx{tx1, tx2})
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Len(t, result.Endorsements, 1)
+	require.Len(t, result.Endorsements[0].EndorsementsWithIdentity, 3)
+	require.Equal(t, "Org1MSP", result.Endorsements[0].EndorsementsWithIdentity[0].Identity.GetMspId())
+	require.Equal(t, "Org2MSP", result.Endorsements[0].EndorsementsWithIdentity[1].Identity.GetMspId())
+	require.Equal(t, "Org3MSP", result.Endorsements[0].EndorsementsWithIdentity[2].Identity.GetMspId())
+}