Integration Tests: Register Owner Wallet (#427)

adecaro · web-flow · commit 17ff03042a1f · 2022-11-21T10:07:31.000+01:00
Signed-off-by: Angelo De Caro &lt;adc@zurich.ibm.com&gt;
diff --git a/integration/nwo/token/fabric/fabric.go b/integration/nwo/token/fabric/fabric.go
@@ -186,6 +186,21 @@ func (p *NetworkHandler) GenIssuerCryptoMaterial(tms *topology2.TMS, nodeID stri
 	return ""
 }
 
+func (p *NetworkHandler) GenOwnerCryptoMaterial(tms *topology2.TMS, nodeID string, walletID string) string {
+	cmGenerator := p.CryptoMaterialGenerators[tms.Driver]
+	Expect(cmGenerator).NotTo(BeNil(), "Crypto material generator for driver %s not found", tms.Driver)
+
+	fscTopology := p.TokenPlatform.GetContext().TopologyByName(fsc.TopologyName).(*fsc.Topology)
+	for _, node := range fscTopology.Nodes {
+		if node.ID() == nodeID {
+			ids := cmGenerator.GenerateOwnerIdentities(tms, node, walletID)
+			return ids[0].Path
+		}
+	}
+	Expect(false).To(BeTrue(), "cannot find FSC node [%s:%s]", tms.Network, nodeID)
+	return ""
+}
+
 func (p *NetworkHandler) SetCryptoMaterialGenerator(driver string, generator generators.CryptoMaterialGenerator) {
 	p.CryptoMaterialGenerators[driver] = generator
 }
diff --git a/integration/nwo/token/orion/orion.go b/integration/nwo/token/orion/orion.go
@@ -184,6 +184,21 @@ func (p *NetworkHandler) GenIssuerCryptoMaterial(tms *topology2.TMS, nodeID stri
 	return ""
 }
 
+func (p *NetworkHandler) GenOwnerCryptoMaterial(tms *topology2.TMS, nodeID string, walletID string) string {
+	cmGenerator := p.CryptoMaterialGenerators[tms.Driver]
+	Expect(cmGenerator).NotTo(BeNil(), "Crypto material generator for driver %s not found", tms.Driver)
+
+	fscTopology := p.TokenPlatform.GetContext().TopologyByName(fsc.TopologyName).(*fsc.Topology)
+	for _, node := range fscTopology.Nodes {
+		if node.ID() == nodeID {
+			ids := cmGenerator.GenerateOwnerIdentities(tms, node, walletID)
+			return ids[0].Path
+		}
+	}
+	Expect(false).To(BeTrue(), "cannot find FSC node [%s:%s]", tms.Network, nodeID)
+	return ""
+}
+
 func (p *NetworkHandler) SetCryptoMaterialGenerator(driver string, generator generators.CryptoMaterialGenerator) {
 	p.CryptoMaterialGenerators[driver] = generator
 }
diff --git a/integration/nwo/token/platform.go b/integration/nwo/token/platform.go
@@ -40,6 +40,7 @@ type NetworkHandler interface {
 	GenerateExtension(tms *topology2.TMS, node *sfcnode.Node) string
 	PostRun(load bool, tms *topology2.TMS)
 	GenIssuerCryptoMaterial(tms *topology2.TMS, nodeID string, walletID string) string
+	GenOwnerCryptoMaterial(tms *topology2.TMS, nodeID string, walletID string) string
 }
 
 type Platform struct {
@@ -202,6 +203,19 @@ func (p *Platform) GenIssuerCryptoMaterial(tmsNetwork string, fscNode string, wa
 	return nh.GenIssuerCryptoMaterial(targetTMS, fscNode, walletID)
 }
 
+func (p *Platform) GenOwnerCryptoMaterial(tmsNetwork string, fscNode string, walletID string) string {
+	var targetTMS *topology2.TMS
+	for _, tms := range p.Topology.TMSs {
+		if tms.Network == tmsNetwork {
+			targetTMS = tms
+		}
+	}
+	Expect(targetTMS).ToNot(BeNil(), "failed to find TMS for network [%s]", tmsNetwork)
+
+	nh := p.NetworkHandlers[p.Context.TopologyByName(targetTMS.Network).Type()]
+	return nh.GenOwnerCryptoMaterial(targetTMS, fscNode, walletID)
+}
+
 func (p *Platform) AddNetworkHandler(label string, nh NetworkHandler) {
 	p.NetworkHandlers[label] = nh
 }
diff --git a/integration/token/fungible/dloghsm/topology.go b/integration/token/fungible/dloghsm/topology.go
@@ -187,6 +187,7 @@ func Topology(backend string, tokenSDKDriver string, auditorAsIssuer bool) []api
 	charlie.RegisterViewFactory("PruneInvalidUnspentTokens", &views.PruneInvalidUnspentTokensViewFactory{})
 	charlie.RegisterViewFactory("WhoDeletedToken", &views.WhoDeletedTokenViewFactory{})
 	charlie.RegisterViewFactory("ListVaultUnspentTokens", &views.ListVaultUnspentTokensViewFactory{})
+	charlie.RegisterViewFactory("RegisterOwnerWallet", &views.RegisterOwnerWalletViewFactory{})
 
 	manager := fscTopology.AddNodeByName("manager").AddOptions(
 		fabric.WithOrganization("Org2"),
diff --git a/integration/token/fungible/support.go b/integration/token/fungible/support.go
@@ -21,7 +21,7 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/driver"
-	token2 "github.com/hyperledger-labs/fabric-token-sdk/token/token"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/token"
 	. "github.com/onsi/gomega"
 )
 
@@ -131,9 +131,9 @@ func CheckBalance(network *integration.Infrastructure, id string, wallet string,
 	b := &views.Balance{}
 	common.JSONUnmarshal(res.([]byte), b)
 	Expect(b.Type).To(BeEquivalentTo(typ))
-	q, err := token2.ToQuantity(b.Quantity, 64)
+	q, err := token.ToQuantity(b.Quantity, 64)
 	Expect(err).NotTo(HaveOccurred())
-	expectedQ := token2.NewQuantityFromUInt64(expected)
+	expectedQ := token.NewQuantityFromUInt64(expected)
 	Expect(expectedQ.Cmp(q)).To(BeEquivalentTo(0), "[%s]!=[%s]", expected, q)
 }
 
@@ -171,26 +171,26 @@ func CheckSpending(network *integration.Infrastructure, id string, wallet string
 	Expect(spending).To(Equal(expected))
 }
 
-func ListIssuerHistory(network *integration.Infrastructure, wallet string, typ string) *token2.IssuedTokens {
+func ListIssuerHistory(network *integration.Infrastructure, wallet string, typ string) *token.IssuedTokens {
 	res, err := network.Client("issuer").CallView("historyIssuedToken", common.JSONMarshall(&views.ListIssuedTokens{
 		Wallet:    wallet,
 		TokenType: typ,
 	}))
 	Expect(err).NotTo(HaveOccurred())
 
-	issuedTokens := &token2.IssuedTokens{}
+	issuedTokens := &token.IssuedTokens{}
 	common.JSONUnmarshal(res.([]byte), issuedTokens)
 	return issuedTokens
 }
 
-func ListUnspentTokens(network *integration.Infrastructure, id string, wallet string, typ string) *token2.UnspentTokens {
+func ListUnspentTokens(network *integration.Infrastructure, id string, wallet string, typ string) *token.UnspentTokens {
 	res, err := network.Client(id).CallView("history", common.JSONMarshall(&views.ListUnspentTokens{
 		Wallet:    wallet,
 		TokenType: typ,
 	}))
 	Expect(err).NotTo(HaveOccurred())
 
-	unspentTokens := &token2.UnspentTokens{}
+	unspentTokens := &token.UnspentTokens{}
 	common.JSONUnmarshal(res.([]byte), unspentTokens)
 	return unspentTokens
 }
@@ -231,7 +231,7 @@ func TransferCash(network *integration.Infrastructure, id string, wallet string,
 	return ""
 }
 
-func PrepareTransferCash(network *integration.Infrastructure, id string, wallet string, typ string, amount uint64, receiver string, auditor string, tokenID *token2.ID, expectedErrorMsgs ...string) (string, []byte) {
+func PrepareTransferCash(network *integration.Infrastructure, id string, wallet string, typ string, amount uint64, receiver string, auditor string, tokenID *token.ID, expectedErrorMsgs ...string) (string, []byte) {
 	transferInput := &views.Transfer{
 		Auditor:   auditor,
 		Wallet:    wallet,
@@ -240,7 +240,7 @@ func PrepareTransferCash(network *integration.Infrastructure, id string, wallet
 		Recipient: network.Identity(receiver),
 	}
 	if tokenID != nil {
-		transferInput.TokenIDs = []*token2.ID{tokenID}
+		transferInput.TokenIDs = []*token.ID{tokenID}
 	}
 	txBoxed, err := network.Client(id).CallView("prepareTransfer", common.JSONMarshall(transferInput))
 	if len(expectedErrorMsgs) == 0 {
@@ -322,7 +322,7 @@ func GetTransactionInfo(network *integration.Infrastructure, id string, txnId st
 	return info
 }
 
-func TransferCashByIDs(network *integration.Infrastructure, id string, wallet string, ids []*token2.ID, amount uint64, receiver string, auditor string, failToRelease bool, expectedErrorMsgs ...string) string {
+func TransferCashByIDs(network *integration.Infrastructure, id string, wallet string, ids []*token.ID, amount uint64, receiver string, auditor string, failToRelease bool, expectedErrorMsgs ...string) string {
 	txIDBoxed, err := network.Client(id).CallView("transfer", common.JSONMarshall(&views.Transfer{
 		Auditor:       auditor,
 		Wallet:        wallet,
@@ -379,7 +379,7 @@ func RedeemCash(network *integration.Infrastructure, id string, wallet string, t
 	Expect(network.Client("auditor").IsTxFinal(common.JSONUnmarshalString(txid))).NotTo(HaveOccurred())
 }
 
-func RedeemCashByIDs(network *integration.Infrastructure, id string, wallet string, ids []*token2.ID, amount uint64, auditor string) {
+func RedeemCashByIDs(network *integration.Infrastructure, id string, wallet string, ids []*token.ID, amount uint64, auditor string) {
 	txid, err := network.Client(id).CallView("redeem", common.JSONMarshall(&views.Redeem{
 		Auditor:  auditor,
 		Wallet:   wallet,
@@ -450,33 +450,33 @@ func PruneInvalidUnspentTokens(network *integration.Infrastructure, ids ...strin
 		eIDBoxed, err := network.Client(id).CallView("PruneInvalidUnspentTokens", common.JSONMarshall(&views.PruneInvalidUnspentTokens{}))
 		Expect(err).NotTo(HaveOccurred())
 
-		var deleted []*token2.ID
+		var deleted []*token.ID
 		common.JSONUnmarshal(eIDBoxed.([]byte), &deleted)
 		Expect(len(deleted)).To(BeZero())
 	}
 }
 
-func ListVaultUnspentTokens(network *integration.Infrastructure, id string) []*token2.ID {
+func ListVaultUnspentTokens(network *integration.Infrastructure, id string) []*token.ID {
 	res, err := network.Client(id).CallView("ListVaultUnspentTokens", common.JSONMarshall(&views.ListVaultUnspentTokens{}))
 	Expect(err).NotTo(HaveOccurred())
 
-	unspentTokens := &token2.UnspentTokens{}
+	unspentTokens := &token.UnspentTokens{}
 	common.JSONUnmarshal(res.([]byte), unspentTokens)
 	count := unspentTokens.Count()
-	var IDs []*token2.ID
+	var IDs []*token.ID
 	for i := 0; i < count; i++ {
 		tok := unspentTokens.At(i)
 		IDs = append(IDs, tok.Id)
 	}
 	return IDs
 }
 
-func CheckIfExistsInVault(network *integration.Infrastructure, id string, tokenIDs []*token2.ID) {
+func CheckIfExistsInVault(network *integration.Infrastructure, id string, tokenIDs []*token.ID) {
 	_, err := network.Client(id).CallView("CheckIfExistsInVault", common.JSONMarshall(&views.CheckIfExistsInVault{IDs: tokenIDs}))
 	Expect(err).NotTo(HaveOccurred())
 }
 
-func WhoDeletedToken(network *integration.Infrastructure, id string, tokenIDs []*token2.ID, txIDs ...string) *views.WhoDeletedTokenResult {
+func WhoDeletedToken(network *integration.Infrastructure, id string, tokenIDs []*token.ID, txIDs ...string) *views.WhoDeletedTokenResult {
 	boxed, err := network.Client(id).CallView("WhoDeletedToken", common.JSONMarshall(&views.WhoDeletedToken{
 		TokenIDs: tokenIDs,
 	}))
@@ -544,4 +544,14 @@ func RegisterIssuerWallet(network *integration.Infrastructure, id string, wallet
 		Path: walletPath,
 	}))
 	Expect(err).NotTo(HaveOccurred())
+	network.Ctx.SetViewClient(walletPath, network.Client(id))
+}
+
+func RegisterOwnerWallet(network *integration.Infrastructure, id string, walletID, walletPath string) {
+	_, err := network.Client(id).CallView("RegisterOwnerWallet", common.JSONMarshall(&views.RegisterOwnerWallet{
+		ID:   walletID,
+		Path: walletPath,
+	}))
+	Expect(err).NotTo(HaveOccurred())
+	network.Ctx.SetViewClient(walletID, network.Client(id))
 }
diff --git a/integration/token/fungible/tests.go b/integration/token/fungible/tests.go
@@ -328,6 +328,8 @@ func TestAll(network *integration.Infrastructure, auditor string) {
 
 	IssueCash(network, "", "USD", 1, "alice", auditor, true)
 
+	testTwoGeneratedOwnerWalletsSameNode(network, auditor)
+
 	CheckBalanceAndHolding(network, "alice", "", "USD", 10)
 	CheckBalanceAndHolding(network, "alice", "", "EUR", 0)
 	CheckBalanceAndHolding(network, "bob", "", "EUR", 30)
@@ -644,3 +646,19 @@ func TestAll(network *integration.Infrastructure, auditor string) {
 		CheckIfExistsInVault(network, auditor, IDs)
 	}
 }
+
+func testTwoGeneratedOwnerWalletsSameNode(network *integration.Infrastructure, auditor string) {
+	tokenPlatform := token.GetPlatform(network.Ctx, "token")
+	newOwnerWalletPath1 := tokenPlatform.GenOwnerCryptoMaterial(tokenPlatform.Topology.TMSs[0].BackendTopology.Name(), "charlie", "charlie.ExtraId1")
+	RegisterOwnerWallet(network, "charlie", "charlie.ExtraId1", newOwnerWalletPath1)
+	newOwnerWalletPath2 := tokenPlatform.GenOwnerCryptoMaterial(tokenPlatform.Topology.TMSs[0].BackendTopology.Name(), "charlie", "charlie.ExtraId2")
+	RegisterOwnerWallet(network, "charlie", "charlie.ExtraId2", newOwnerWalletPath2)
+
+	IssueCash(network, "", "SPE", 100, "charlie", auditor, true)
+	TransferCash(network, "charlie", "", "SPE", 25, "charlie.ExtraId1", auditor)
+	TransferCash(network, "charlie", "charlie.ExtraId1", "SPE", 15, "charlie.ExtraId2", auditor)
+
+	CheckBalanceAndHolding(network, "charlie", "", "SPE", 75)
+	CheckBalanceAndHolding(network, "charlie", "charlie.ExtraId1", "SPE", 10)
+	CheckBalanceAndHolding(network, "charlie", "charlie.ExtraId2", "SPE", 15)
+}
diff --git a/integration/token/fungible/topology.go b/integration/token/fungible/topology.go
@@ -187,6 +187,7 @@ func Topology(backend string, tokenSDKDriver string, auditorAsIssuer bool) []api
 	charlie.RegisterViewFactory("PruneInvalidUnspentTokens", &views.PruneInvalidUnspentTokensViewFactory{})
 	charlie.RegisterViewFactory("WhoDeletedToken", &views.WhoDeletedTokenViewFactory{})
 	charlie.RegisterViewFactory("ListVaultUnspentTokens", &views.ListVaultUnspentTokensViewFactory{})
+	charlie.RegisterViewFactory("RegisterOwnerWallet", &views.RegisterOwnerWalletViewFactory{})
 
 	manager := fscTopology.AddNodeByName("manager").AddOptions(
 		fabric.WithOrganization("Org2"),
diff --git a/integration/token/fungible/views/wallets.go b/integration/token/fungible/views/wallets.go
@@ -42,3 +42,32 @@ func (p *RegisterIssuerWalletViewFactory) NewView(in []byte) (view.View, error)
 
 	return f, nil
 }
+
+type RegisterOwnerWallet struct {
+	TMSID token.TMSID
+	ID    string
+	Path  string
+}
+
+// RegisterOwnerWalletView is a view that registers an owner wallet
+type RegisterOwnerWalletView struct {
+	*RegisterOwnerWallet
+}
+
+func (r *RegisterOwnerWalletView) Call(context view.Context) (interface{}, error) {
+	tms := token.GetManagementService(context, token.WithTMSID(r.TMSID))
+	assert.NotNil(tms, "tms not found [%s]", r.TMSID)
+	err := tms.WalletManager().RegisterOwnerWallet(r.ID, r.Path)
+	assert.NoError(err, "failed to register owner wallet [%s:%s]", r.ID, r.TMSID)
+	return nil, nil
+}
+
+type RegisterOwnerWalletViewFactory struct{}
+
+func (p *RegisterOwnerWalletViewFactory) NewView(in []byte) (view.View, error) {
+	f := &RegisterOwnerWalletView{RegisterOwnerWallet: &RegisterOwnerWallet{}}
+	err := json.Unmarshal(in, f.RegisterOwnerWallet)
+	assert.NoError(err, "failed unmarshalling input")
+
+	return f, nil
+}
diff --git a/token/core/identity/msp/idemix/wallet.go b/token/core/identity/msp/idemix/wallet.go
@@ -148,5 +148,6 @@ func (w *wallet) MapToID(v interface{}) (view.Identity, string) {
 
 // RegisterIdentity registers the given identity
 func (w *wallet) RegisterIdentity(id string, path string) error {
+	logger.Debugf("register idemix identity [%s:%s]", id, path)
 	return w.localMembership.RegisterIdentity(id, path)
 }
diff --git a/token/core/identity/msp/x509/wallet.go b/token/core/identity/msp/x509/wallet.go
@@ -165,5 +165,6 @@ func (w *wallet) MapToID(v interface{}) (view.Identity, string) {
 
 // RegisterIdentity registers the given identity
 func (w *wallet) RegisterIdentity(id string, path string) error {
+	logger.Debugf("register x509 identity [%s:%s]", id, path)
 	return w.localMembership.RegisterIdentity(id, path)
 }
diff --git a/token/core/identity/provider.go b/token/core/identity/provider.go
@@ -172,10 +172,12 @@ func (p *Provider) GetEnrollmentID(auditInfo []byte) (string, error) {
 }
 
 func (p *Provider) RegisterOwnerWallet(id string, path string) error {
+	logger.Debugf("register owner wallet [%s:%s]", id, path)
 	return p.wallets[driver.OwnerRole].RegisterIdentity(id, path)
 }
 
 func (p *Provider) RegisterIssuerWallet(id string, path string) error {
+	logger.Debugf("register issuer wallet [%s:%s]", id, path)
 	return p.wallets[driver.IssuerRole].RegisterIdentity(id, path)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -148,5 +148,6 @@ func (w *wallet) MapToID(v interface{}) (view.Identity, string) {`
`148`	`148`
`149`	`149`	`// RegisterIdentity registers the given identity`
`150`	`150`	`func (w *wallet) RegisterIdentity(id string, path string) error {`
	`151`	`+ logger.Debugf("register idemix identity [%s:%s]", id, path)`
`151`	`152`	`return w.localMembership.RegisterIdentity(id, path)`
`152`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,5 +165,6 @@ func (w *wallet) MapToID(v interface{}) (view.Identity, string) {`
`165`	`165`
`166`	`166`	`// RegisterIdentity registers the given identity`
`167`	`167`	`func (w *wallet) RegisterIdentity(id string, path string) error {`
	`168`	`+ logger.Debugf("register x509 identity [%s:%s]", id, path)`
`168`	`169`	`return w.localMembership.RegisterIdentity(id, path)`
`169`	`170`	`}`