[FAB-11941] Commit token tx via custom processor

- Register token tx Processor with customtx
- Correct the method name in FabricIdentityDeserializerManager

Change-Id: I3dc1c7aa1eac1b37bf6a7eeaac08484806f7fb69
Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>

Author: wenjianqiao

core/peer/configtx_test.go

@@ -24,6 +24,7 @@ import (
 	genesisconfig "github.com/hyperledger/fabric/common/tools/configtxgen/localconfig"
 	"github.com/hyperledger/fabric/core/config/configtest"
 	"github.com/hyperledger/fabric/core/ledger"
+	"github.com/hyperledger/fabric/core/ledger/customtx"
 	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	ordererconfig "github.com/hyperledger/fabric/orderer/common/localconfig"
@@ -130,6 +131,21 @@ func TestGenesisBlockCreateLedger(t *testing.T) {
 	t.Logf("chanConf = %s", chanConf)
 }
 
+func TestCustomTxProcessors(t *testing.T) {
+	cleanup := setupPeerFS(t)
+	defer cleanup()
+
+	ledgermgmt.InitializeExistingTestEnvWithInitializer(&ledgermgmt.Initializer{
+		CustomTxProcessors: ConfigTxProcessors,
+	})
+	defer ledgermgmt.CleanupTestEnv()
+
+	processor := customtx.GetProcessor(common.HeaderType_CONFIG)
+	assert.NotNil(t, processor)
+	processor = customtx.GetProcessor(common.HeaderType_TOKEN_TRANSACTION)
+	assert.NotNil(t, processor)
+}
+
 type testHelper struct {
 	t *testing.T
 }

core/peer/peer.go

@@ -39,6 +39,8 @@ import (
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"
+	"github.com/hyperledger/fabric/token/tms/manager"
+	"github.com/hyperledger/fabric/token/transaction"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	"golang.org/x/sync/semaphore"
@@ -49,8 +51,12 @@ var peerLogger = flogging.MustGetLogger("peer")
 var peerServer *comm.GRPCServer
 
 var configTxProcessor = newConfigTxProcessor()
+var tokenTxProcessor = &transaction.Processor{
+	TMSManager: &manager.Manager{
+		IdentityDeserializerManager: &manager.FabricIdentityDeserializerManager{}}}
 var ConfigTxProcessors = customtx.Processors{
-	common.HeaderType_CONFIG: configTxProcessor,
+	common.HeaderType_CONFIG:            configTxProcessor,
+	common.HeaderType_TOKEN_TRANSACTION: tokenTxProcessor,
 }
 
 // singleton instance to manage credentials for the peer across channel config changes

token/tms/manager/manager.go

@@ -7,23 +7,22 @@ SPDX-License-Identifier: Apache-2.0
 package manager
 
 import (
+	"github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/token/identity"
 	"github.com/hyperledger/fabric/token/tms/plain"
 	"github.com/hyperledger/fabric/token/transaction"
 	"github.com/pkg/errors"
 )
 
-// FabricIdentityDeserializerManager implements a DeserializerManager
-// by routing the call to a mapping function.
+//go:generate counterfeiter -o mock/identity_deserializer_manager.go -fake-name DeserializerManager . DeserializerManager
+
+// FabricIdentityDeserializerManager implements an DeserializerManager
+// by routing the call to the msp/mgmt package
 type FabricIdentityDeserializerManager struct {
-	// Mapper maps channel names to deserializer.
-	// For example, it can be implemented by using the msp/mgmt package,
-	// i.e. mgmt.GetDeserializers()[channel]
-	Mapper func(channel string) (identity.Deserializer, bool)
 }
 
-func (m *FabricIdentityDeserializerManager) Deserializer(channel string) (identity.Deserializer, error) {
-	id, ok := m.Mapper(channel)
+func (*FabricIdentityDeserializerManager) Deserializer(channel string) (identity.Deserializer, error) {
+	id, ok := mgmt.GetDeserializers()[channel]
 	if !ok {
 		return nil, errors.New("channel not found")
 	}

token/tms/manager/manager_test.go

@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
 package manager_test
 
 import (
-	"github.com/hyperledger/fabric/token/identity"
 	"github.com/hyperledger/fabric/token/identity/mock"
 	"github.com/hyperledger/fabric/token/tms/manager"
 	"github.com/hyperledger/fabric/token/tms/plain"
@@ -29,11 +28,11 @@ var _ = Describe("Manager", func() {
 
 	Describe("Get a TxProcessor for a non-existent channel", func() {
 		BeforeEach(func() {
-			fakeIdentityDeserializerManager.DeserializerReturns(nil, errors.New("GetIdentityDeserializerReturns no-way-man"))
+			fakeIdentityDeserializerManager.DeserializerReturns(nil, errors.New("GetDeserializerReturns no-way-man"))
 		})
 		It("returns an error", func() {
 			_, err := mgm.GetTxProcessor("boguschannel")
-			Expect(err.Error()).To(Equal("failed getting identity deserialiser manager for channel 'boguschannel': GetIdentityDeserializerReturns no-way-man"))
+			Expect(err.Error()).To(Equal("failed getting identity deserialiser manager for channel 'boguschannel': GetDeserializerReturns no-way-man"))
 		})
 	})
 
@@ -60,36 +59,12 @@ var _ = Describe("Manager", func() {
 })
 
 var _ = Describe("FabricIdentityDeserializerManager", func() {
-	var (
-		fabricIdentityDeserializerManager *manager.FabricIdentityDeserializerManager
-	)
-
-	Describe("Get an IdentityDeserializer for an existent channel", func() {
+	Describe("Get an IdentityDeserializer for a non-existent channel", func() {
 		var (
-			fakeDeserilizer *mock.Deserializer
+			fabricIdentityDeserializerManager *manager.FabricIdentityDeserializerManager
 		)
 		BeforeEach(func() {
-			fakeDeserilizer = &mock.Deserializer{}
-			fabricIdentityDeserializerManager = &manager.FabricIdentityDeserializerManager{
-				Mapper: func(channel string) (identity.Deserializer, bool) {
-					return fakeDeserilizer, true
-				},
-			}
-		})
-		It("returns a deserializer", func() {
-			d, err := fabricIdentityDeserializerManager.Deserializer("boguschannel")
-			Expect(err).NotTo(HaveOccurred())
-			Expect(d).To(Equal(fakeDeserilizer))
-		})
-	})
-
-	Describe("Get an IdentityDeserializer for a non-existent channel", func() {
-		BeforeEach(func() {
-			fabricIdentityDeserializerManager = &manager.FabricIdentityDeserializerManager{
-				Mapper: func(channel string) (identity.Deserializer, bool) {
-					return nil, false
-				},
-			}
+			fabricIdentityDeserializerManager = &manager.FabricIdentityDeserializerManager{}
 		})
 		It("returns an error", func() {
 			_, err := fabricIdentityDeserializerManager.Deserializer("boguschannel")