NWO: remove generic platform #12

Makefile

@@ -52,7 +52,8 @@ integration-tests: docker-images dependencies
 	cd ./integration/fabric/iou; ginkgo -keepGoing --slowSpecThreshold 60 .
 	cd ./integration/fabric/atsa/chaincode; ginkgo -keepGoing --slowSpecThreshold 60 .
 	cd ./integration/fabric/atsa/nochaincode; ginkgo -keepGoing --slowSpecThreshold 60 .
-	cd ./integration/generic/pingpong/; ginkgo -keepGoing --slowSpecThreshold 60 .
+	cd ./integration/fsc/pingpong/; ginkgo -keepGoing --slowSpecThreshold 60 .
+	cd ./integration/fsc/stoprestart; ginkgo -keepGoing --slowSpecThreshold 60 .
 
 .PHONY: tidy
 tidy:
@@ -69,8 +70,8 @@ clean:
 	rm -rf ./integration/fabric/atsa/chaincode/cmd
 	rm -rf ./integration/fabric/atsa/nochaincode/cmd
 	rm -rf ./integration/fabric/iou/cmd/
-	rm -rf ./integration/generic/stoprestart/cmd
-	rm -rf ./integration/generic/pingpong/cmd/responder
+	rm -rf ./integration/fsc/stoprestart/cmd
+	rm -rf ./integration/fsc/pingpong/cmd/responder
 	rm -rf ./integration/fscnodes
 
 .PHONY: artifactsgen

go.mod

@@ -23,10 +23,8 @@ require (
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/protobuf v1.4.3
 	github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 // indirect
-	github.com/google/addlicense v0.0.0-20210428195630-6d92264d7170 // indirect
 	github.com/google/go-cmp v0.5.0
 	github.com/google/uuid v1.2.0 // indirect
-	github.com/gordonklaus/ineffassign v0.0.0-20210522101830-0589229737b2 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hyperledger/fabric v1.4.0-rc1.0.20200930182727-344fda602252

go.sum

@@ -197,8 +197,6 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 h1:ur2rms48b3Ep1dxh7aUV2FZEQ8jEVO2F6ILKx8ofkAg=
 github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/addlicense v0.0.0-20210428195630-6d92264d7170 h1:jLUa4MO3autxlRJmC4KubeE5QGIb5JqW9oEaqYTb/fA=
-github.com/google/addlicense v0.0.0-20210428195630-6d92264d7170/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA=
 github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/flatbuffers v1.12.0 h1:/PtAHvnBY4Kqnx/xCQ3OIV9uYcSFGScBsWI3Oogeh6w=
 github.com/google/flatbuffers v1.12.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
@@ -215,8 +213,6 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gordonklaus/ineffassign v0.0.0-20210522101830-0589229737b2 h1:hC4RAQwLzbDbHsa+CwwGBm1uG2oX9o3Frx9G73duPi8=
-github.com/gordonklaus/ineffassign v0.0.0-20210522101830-0589229737b2/go.mod h1:M9mZEtGIsR1oDaZagNPNG9iq9n2HrhZ17dsXk73V3Lw=
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
@@ -545,8 +541,6 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.16.3 h1:3s86PZkI1ApJh6HFIzC1gXby/mIyZqfE5zxSvtoBSsM=
-github.com/onsi/ginkgo v1.16.3/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
 github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
@@ -787,7 +781,6 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -821,11 +814,8 @@ golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210601080250-7ecdf8ef093b h1:qh4f65QIVFjq9eBURLEYWqaEXmOyqdUyiBSgaXWccWk=
-golang.org/x/sys v0.0.0-20210601080250-7ecdf8ef093b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603125802-9665404d3644 h1:CA1DEQ4NdKphKeL70tvsWNdT5oFh1lOjihRcEDROi0I=
 golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -854,7 +844,6 @@ golang.org/x/tools v0.0.0-20191127201027-ecd32218bd7f/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200131233409-575de47986ce/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201105001634-bc3cf281b174/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

integration/fabric/atsa/chaincode/views/seller.go

@@ -54,7 +54,9 @@ type TransferView struct {
 }
 
 func (a *TransferView) Call(context view.Context) (interface{}, error) {
-	mspID, err := fabric.GetDefaultChannel(context).MSPManager().GetMSPIdentifier(a.Recipient)
+	mspID, err := fabric.GetDefaultChannel(context).MSPManager().GetMSPIdentifier(
+		fabric.GetDefaultNetwork(context).IdentityProvider().Identity(a.Recipient.UniqueID()),
+	)
 	assert.NoError(err, "failed deserializing identity")
 
 	assetPrice, err := a.AssetPrice.Bytes()

integration/fabric/atsa/nochaincode/client.go

@@ -8,7 +8,7 @@ package nochaincode
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/atsa/nochaincode/views"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common"
-	view "github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
 type ViewClient interface {
@@ -32,8 +32,9 @@ func (c *Client) Identity() view.Identity {
 
 func (c *Client) Issue(asset *views.Asset) (string, error) {
 	_, err := c.c.CallView("issue", common.JSONMarshall(&views.Issue{
-		Asset:    asset,
-		Approver: c.approver,
+		Asset:     asset,
+		Recipient: asset.Owner,
+		Approver:  c.approver,
 	}))
 	if err != nil {
 		return "", err

integration/fabric/atsa/nochaincode/views/accept.go

@@ -14,6 +14,10 @@ import (
 type AcceptAssetView struct{}
 
 func (a *AcceptAssetView) Call(context view.Context) (interface{}, error) {
+	// Respond to a request for an identity
+	id, err := state.RespondRequestRecipientIdentity(context)
+	assert.NoError(err, "failed to respond to identity request")
+
 	// Expect an state transaction
 	tx, err := state.ReceiveTransaction(context)
 	assert.NoError(err)
@@ -24,7 +28,7 @@ func (a *AcceptAssetView) Call(context view.Context) (interface{}, error) {
 
 	asset := &Asset{}
 	assert.NoError(tx.Outputs().At(0).State(asset), "failed unmarshalling asset")
-	assert.True(asset.Owner.Equal(context.Me()), "expected me to be the owner, got [%s]", asset.Owner)
+	assert.True(asset.Owner.Equal(id), "expected me to be the owner, got [%s]", asset.Owner)
 	//assert.Equal([]byte("Hello World!!!"), asset.PrivateProperties)
 
 	// Accept and send back

integration/fabric/atsa/nochaincode/views/agree.go

@@ -8,6 +8,7 @@ package views
 import (
 	"encoding/json"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
@@ -28,12 +29,13 @@ func (a *AgreeToSellView) Call(context view.Context) (interface{}, error) {
 	tx, err := state.NewTransaction(context)
 	assert.NoError(err, "failed creating transaction")
 	tx.SetNamespace("asset_transfer")
-	assert.NoError(tx.AddCommand("agreeToSell", context.Me()), "failed adding issue command")
+	me := fabric.GetIdentityProvider(context).DefaultIdentity()
+	assert.NoError(tx.AddCommand("agreeToSell", me), "failed adding issue command")
 
-	a.Agreement.Owner = context.Me()
+	a.Agreement.Owner = me
 	assert.NoError(tx.AddOutput(a.Agreement, state.WithHashHiding()), "failed adding output")
 
-	_, err = context.RunView(state.NewCollectEndorsementsView(tx, context.Me()))
+	_, err = context.RunView(state.NewCollectEndorsementsView(tx, me))
 	assert.NoError(err, "failed collecting endorsement")
 
 	_, err = context.RunView(state.NewCollectApprovesView(tx, a.Approver))
@@ -70,12 +72,13 @@ func (a *AgreeToBuyView) Call(context view.Context) (interface{}, error) {
 	tx, err := state.NewTransaction(context)
 	assert.NoError(err, "failed creating transaction")
 	tx.SetNamespace("asset_transfer")
-	assert.NoError(tx.AddCommand("agreeToBuy", context.Me()), "failed adding issue command")
+	me := fabric.GetIdentityProvider(context).DefaultIdentity()
+	assert.NoError(tx.AddCommand("agreeToBuy", me), "failed adding issue command")
 
-	a.Agreement.Owner = context.Me()
+	a.Agreement.Owner = me
 	assert.NoError(tx.AddOutput(a.Agreement, state.WithHashHiding()), "failed adding output")
 
-	_, err = context.RunView(state.NewCollectEndorsementsView(tx, context.Me()))
+	_, err = context.RunView(state.NewCollectEndorsementsView(tx, me))
 	assert.NoError(err, "failed collecting endorsement")
 
 	_, err = context.RunView(state.NewCollectApprovesView(tx, a.Approver))

integration/fabric/atsa/nochaincode/views/issue.go

@@ -8,29 +8,38 @@ package views
 import (
 	"encoding/json"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
 type Issue struct {
-	Asset    *Asset
-	Approver view.Identity
+	Asset     *Asset
+	Recipient view.Identity
+	Approver  view.Identity
 }
 
 type IssueView struct {
 	*Issue
 }
 
 func (f *IssueView) Call(context view.Context) (interface{}, error) {
+	assetOwner, err := state.RequestRecipientIdentity(context, f.Recipient)
+	assert.NoError(err, "failed getting recipient identity")
+
 	// Prepare transaction
 	tx, err := state.NewTransaction(context)
 	assert.NoError(err, "failed creating transaction")
 	tx.SetNamespace("asset_transfer")
-	assert.NoError(tx.AddCommand("issue", context.Me(), f.Asset.Owner), "failed adding issue command")
+
+	f.Asset.Owner = assetOwner
+	me := fabric.GetIdentityProvider(context).DefaultIdentity()
+
+	assert.NoError(tx.AddCommand("issue", me, f.Asset.Owner), "failed adding issue command")
 	assert.NoError(tx.AddOutput(f.Asset), "failed adding output")
 
-	_, err = context.RunView(state.NewCollectEndorsementsView(tx, context.Me(), f.Asset.Owner))
+	_, err = context.RunView(state.NewCollectEndorsementsView(tx, me, f.Asset.Owner))
 	assert.NoError(err, "failed collecting endorsement")
 
 	_, err = context.RunView(state.NewCollectApprovesView(tx, f.Approver))

integration/fabric/atsa/nochaincode/views/transfer.go

@@ -8,6 +8,7 @@ package views
 import (
 	"encoding/json"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
@@ -26,6 +27,9 @@ type TransferView struct {
 }
 
 func (f *TransferView) Call(context view.Context) (interface{}, error) {
+	assetOwner, err := state.RequestRecipientIdentity(context, f.Recipient)
+	assert.NoError(err, "failed getting recipient identity")
+
 	// Prepare transaction
 	tx, err := state.NewTransaction(context)
 	assert.NoError(err, "failed creating transaction")
@@ -35,13 +39,13 @@ func (f *TransferView) Call(context view.Context) (interface{}, error) {
 	assert.NoError(tx.AddInputByLinearID(f.AgreementId, agreementToSell, state.WithCertification()), "failed adding input")
 	asset := &Asset{}
 	assert.NoError(tx.AddInputByLinearID(f.AssetId, asset, state.WithCertification()), "failed adding input")
-	assert.NoError(tx.AddCommand("transfer", asset.Owner, f.Recipient), "failed adding issue command")
-	asset.Owner = f.Recipient
+	assert.NoError(tx.AddCommand("transfer", asset.Owner, assetOwner), "failed adding issue command")
+	asset.Owner = assetOwner
 	assert.NoError(tx.AddOutput(asset), "failed adding output")
 	assert.NoError(tx.Delete(agreementToSell), "failed deleting")
 
 	// Send tx and receive the modified transaction
-	tx2, err := state.SendAndReceiveTransaction(context, tx, f.Recipient)
+	tx2, err := state.SendAndReceiveTransaction(context, tx, assetOwner)
 	assert.NoError(err, "failed sending and received transaction")
 
 	// Check that tx2 is as expected
@@ -54,7 +58,7 @@ func (f *TransferView) Call(context view.Context) (interface{}, error) {
 	assert.NoError(inputState.VerifyCertification(), "failed certifying agreement to buy")
 	assert.NoError(inputState.State(agreementToBuy), "failed unmarshalling agreement to buy")
 
-	_, err = context.RunView(state.NewCollectEndorsementsView(tx2, context.Me(), f.Recipient))
+	_, err = context.RunView(state.NewCollectEndorsementsView(tx2, fabric.GetIdentityProvider(context).DefaultIdentity(), assetOwner))
 	assert.NoError(err, "failed collecting endorsement")
 
 	_, err = context.RunView(state.NewCollectApprovesView(tx2, f.Approver))
@@ -79,13 +83,17 @@ func (p *TransferViewFactory) NewView(in []byte) (view.View, error) {
 type TransferResponderView struct{}
 
 func (t *TransferResponderView) Call(context view.Context) (interface{}, error) {
+	// First, respond to a request for an identity
+	id, err := state.RespondRequestRecipientIdentity(context)
+	assert.NoError(err, "failed to respond to identity request")
+
 	// Expect an state transaction
 	tx, err := state.ReceiveTransaction(context)
 	assert.NoError(err)
 
 	// Check that the transaction is as expected
-	assert.Equal(2, tx.Inputs().Count(), "expected two input, got [%d]", tx.Inputs().Count())
-	assert.Equal(2, tx.Outputs().Count(), "expected two output, got [%d]", tx.Outputs().Count())
+	assert.Equal(2, tx.Inputs().Count(), "expected two inputs, got [%d]", tx.Inputs().Count())
+	assert.Equal(2, tx.Outputs().Count(), "expected two outputs, got [%d]", tx.Outputs().Count())
 	assert.Equal(1, tx.Outputs().Deleted().Count(), "expected one delete, got [%d]", tx.Outputs().Deleted().Count())
 
 	agreementToSell := &AgreementToSell{}
@@ -100,7 +108,7 @@ func (t *TransferResponderView) Call(context view.Context) (interface{}, error)
 
 	assetOut := &Asset{}
 	assert.NoError(tx.Outputs().Written().At(0).State(assetOut), "failed unmarshalling asset out")
-	assert.True(assetOut.Owner.Equal(context.Me()), "expected me to be the owner, got [%s]", assetOut.Owner)
+	assert.True(assetOut.Owner.Equal(id), "expected me to be the owner, got [%s]", assetOut.Owner)
 
 	assert.Equal(assetIn.PrivateProperties, assetOut.PrivateProperties)
 	assert.Equal([]byte("Hello World!!!"), assetOut.PrivateProperties)

integration/fabric/iou/borrowercreate.go

@@ -30,7 +30,7 @@ func (i *CreateIOUInitiatorView) Call(context view.Context) (interface{}, error)
 	lender := fabric.GetIdentityProvider(context).Identity("lender")
 	iou := &IOUState{
 		Amount:  i.Amount,
-		Parties: []view.Identity{context.Me(), lender},
+		Parties: []view.Identity{fabric.GetIdentityProvider(context).DefaultIdentity(), lender},
 	}
 
 	// Add the state to the transaction

integration/fabric/iou/lendercreate.go

@@ -6,6 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 package iou
 
 import (
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
@@ -36,13 +37,14 @@ func (i *CreateIOUResponderView) Call(context view.Context) (interface{}, error)
 			return nil, errors.Errorf("invalid amount, "+
 				"expected at least 5, was %d", iouState.Amount)
 		}
+		me := fabric.GetIdentityProvider(context).DefaultIdentity()
 		assert.Equal(2, iouState.Owners().Count(), "invalid state, "+
 			"expected 2 identities, was %d", iouState.Owners().Count())
-		assert.True(iouState.Owners().Contain(context.Me()), "invalid state,"+
+		assert.True(iouState.Owners().Contain(me), "invalid state,"+
 			"it does not contain lender identity")
-		assert.False(iouState.Owners().Others(context.Me()).Contain(context.Me()), "invalid state,"+
+		assert.False(iouState.Owners().Others(me).Contain(me), "invalid state,"+
 			"it does not contain borrower identity")
-		assert.NoError(tx.HasBeenEndorsedBy(iouState.Owners().Others(context.Me())...),
+		assert.NoError(tx.HasBeenEndorsedBy(iouState.Owners().Others(me)...),
 			"the borrower has not endorsed")
 	default:
 		return nil, errors.Errorf("invalid command, "+

integration/fabric/iou/lenderupdate.go

@@ -6,10 +6,12 @@ SPDX-License-Identifier: Apache-2.0
 package iou
 
 import (
+	"github.com/pkg/errors"
+
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/state"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
-	"github.com/pkg/errors"
 )
 
 type UpdateIOUResponderView struct{}
@@ -42,7 +44,9 @@ func (i *UpdateIOUResponderView) Call(context view.Context) (interface{}, error)
 		}
 		assert.True(inState.Owners().Match(outState.Owners()), "invalid owners, "+
 			"input and output should have the same owners")
-		assert.NoError(tx.HasBeenEndorsedBy(inState.Owners().Others(context.Me())...),
+		assert.NoError(tx.HasBeenEndorsedBy(inState.Owners().Others(
+			fabric.GetIdentityProvider(context).DefaultIdentity(),
+		)...),
 			"the borrower has not endorsed")
 	default:
 		return nil, errors.Errorf("invalid command, "+