remove some of the panics in the code, return an error instead

adecaro · adecaro · commit c5aad5119ee0 · 2024-12-12T10:11:50.000+01:00
Signed-off-by: Angelo De Caro &lt;adc@zurich.ibm.com&gt;
diff --git a/integration/fabric/atsa/chaincode/views/seller.go b/integration/fabric/atsa/chaincode/views/seller.go
@@ -66,7 +66,7 @@ func (a *TransferView) Call(ctx view.Context) (interface{}, error) {
 	)
 	assert.NoError(err, "failed getting sender MSP-ID")
 	recipientMSPID, err := ch.MSPManager().GetMSPIdentifier(
-		fns.IdentityProvider().Identity(a.Recipient.UniqueID()),
+		assert.ValidIdentity(fns.IdentityProvider().Identity(a.Recipient.UniqueID())),
 	)
 	assert.NoError(err, "failed getting recipient MSP-ID")
 
diff --git a/platform/fabric/core/generic/chaincode/invoke.go b/platform/fabric/core/generic/chaincode/invoke.go
@@ -193,16 +193,16 @@ func (i *Invoke) WithContext(context context.Context) driver.ChaincodeInvocation
 	return i
 }
 
-func (i *Invoke) WithTransientEntry(k string, v interface{}) driver.ChaincodeInvocation {
+func (i *Invoke) WithTransientEntry(k string, v interface{}) (driver.ChaincodeInvocation, error) {
 	if i.TransientMap == nil {
 		i.TransientMap = map[string][]byte{}
 	}
 	b, err := i.toBytes(v)
 	if err != nil {
-		panic(err)
+		return nil, errors.WithMessagef(err, "error converting transient entry to bytes")
 	}
 	i.TransientMap[k] = b
-	return i
+	return i, nil
 }
 
 func (i *Invoke) WithEndorsersByMSPIDs(mspIDs ...string) driver.ChaincodeInvocation {
diff --git a/platform/fabric/core/generic/id/provider.go b/platform/fabric/core/generic/id/provider.go
@@ -8,6 +8,7 @@ package id
 
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+	"github.com/pkg/errors"
 )
 
 type EndpointService interface {
@@ -22,10 +23,10 @@ func NewProvider(endpointService EndpointService) (*provider, error) {
 	return &provider{endpointService: endpointService}, nil
 }
 
-func (p *provider) Identity(label string) view.Identity {
+func (p *provider) Identity(label string) (view.Identity, error) {
 	id, err := p.endpointService.GetIdentity(label)
 	if err != nil {
-		panic(err)
+		return nil, errors.WithMessagef(err, "failed getting identity [%s]", label)
 	}
-	return id
+	return id, nil
 }
diff --git a/platform/fabric/core/generic/msp/driver/driver.go b/platform/fabric/core/generic/msp/driver/driver.go
@@ -51,7 +51,7 @@ type DeserializerManager interface {
 
 type Manager interface {
 	AddDeserializer(deserializer Deserializer)
-	AddMSP(name string, mspType string, enrollmentID string, idGetter driver.GetIdentityFunc)
+	AddMSP(name string, mspType string, enrollmentID string, idGetter driver.GetIdentityFunc) error
 	Config() Config
 	DefaultMSP() string
 	SignerService() SignerService
diff --git a/platform/fabric/core/generic/msp/idemix/provider.go b/platform/fabric/core/generic/msp/idemix/provider.go
@@ -182,7 +182,7 @@ func NewProvider(conf1 *m.MSPConfig, signerService mspdriver.SignerService, sigT
 	case Any:
 		verType = bccsp.BestEffort
 	default:
-		panic("invalid sig type")
+		return nil, errors.Errorf("unknown verification type [%d]", sigType)
 	}
 	if verType == bccsp.BestEffort {
 		sigType = bccsp.Standard
@@ -331,7 +331,7 @@ func (p *Provider) Identity(opts *driver.IdentityOptions) (view.Identity, []byte
 			return nil, nil, err
 		}
 	default:
-		panic("invalid sig type")
+		return nil, nil, errors.Errorf("unsupported signing type [%d]", sigType)
 	}
 	return raw, infoRaw, nil
 }
diff --git a/platform/fabric/core/generic/msp/service.go b/platform/fabric/core/generic/msp/service.go
@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
 package msp
 
 import (
-	"fmt"
 	"sync"
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/msp/driver"
@@ -103,8 +102,7 @@ func (s *service) Config() driver.Config {
 }
 
 func (s *service) DefaultMSP() string {
-	// TODO implement me
-	panic("implement me")
+	return s.config.DefaultMSP()
 }
 
 func (s *service) SignerService() driver.SignerService {
@@ -131,20 +129,23 @@ func (s *service) DefaultIdentity() view.Identity {
 	return s.defaultIdentity
 }
 
-func (s *service) AnonymousIdentity() view.Identity {
-	id := s.Identity("idemix")
+func (s *service) AnonymousIdentity() (view.Identity, error) {
+	id, err := s.Identity("idemix")
+	if err != nil {
+		return nil, errors.WithMessagef(err, "failed to get default anonymous identity labelled `idemix`")
+	}
 	if err := s.binderService.Bind(s.defaultViewIdentity, id); err != nil {
-		panic(err)
+		return nil, errors.WithMessagef(err, "failed to bind identity [%s] to default [%s]", id, s.defaultViewIdentity)
 	}
-	return id
+	return id, nil
 }
 
-func (s *service) Identity(label string) view.Identity {
+func (s *service) Identity(label string) (view.Identity, error) {
 	id, err := s.GetIdentityByID(label)
 	if err != nil {
-		panic(err)
+		return nil, errors.WithMessagef(err, "failed to get identity [%s]", label)
 	}
-	return id
+	return id, nil
 }
 
 func (s *service) IsMe(id view.Identity) bool {
@@ -253,7 +254,9 @@ func (s *service) RegisterIdemixMSP(id string, path string, mspID string) error
 	}
 
 	s.deserializerManager.AddDeserializer(provider)
-	s.AddMSP(id, IdemixMSP, provider.EnrollmentID(), idemix.NewIdentityCache(provider.Identity, s.cacheSize, nil).Identity)
+	if err := s.AddMSP(id, IdemixMSP, provider.EnrollmentID(), idemix.NewIdentityCache(provider.Identity, s.cacheSize, nil).Identity); err != nil {
+		return errors.Wrapf(err, "failed adding idemix msp [%s] to [%s]", id, path)
+	}
 	logger.Debugf("added IdemixMSP msp for id %s with cache of size %d", id+"@"+provider.EnrollmentID(), s.cacheSize)
 	return nil
 }
@@ -268,7 +271,9 @@ func (s *service) RegisterX509MSP(id string, path string, mspID string) error {
 	}
 
 	s.deserializerManager.AddDeserializer(provider)
-	s.AddMSP(id, BccspMSP, provider.EnrollmentID(), provider.Identity)
+	if err := s.AddMSP(id, BccspMSP, provider.EnrollmentID(), provider.Identity); err != nil {
+		return errors.Wrapf(err, "failed adding bccsp msp [%s] to [%s]", id, path)
+	}
 
 	return nil
 }
@@ -292,14 +297,14 @@ func (s *service) Refresh() error {
 	return nil
 }
 
-func (s *service) AddMSP(name string, mspType string, enrollmentID string, IdentityGetter fdriver.GetIdentityFunc) {
+func (s *service) AddMSP(name string, mspType string, enrollmentID string, IdentityGetter fdriver.GetIdentityFunc) error {
 	if mspType == BccspMSP && s.binderService != nil {
 		id, _, err := IdentityGetter(nil)
 		if err != nil {
-			panic(fmt.Sprintf("cannot get identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err))
+			return errors.Wrapf(err, "cannot get identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err)
 		}
 		if err := s.binderService.Bind(s.defaultViewIdentity, id); err != nil {
-			panic(fmt.Sprintf("cannot bind identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err))
+			return errors.Wrapf(err, "cannot bind identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err)
 		}
 	}
 
@@ -312,7 +317,7 @@ func (s *service) AddMSP(name string, mspType string, enrollmentID string, Ident
 	if mspType == BccspMSP {
 		id, _, err := IdentityGetter(nil)
 		if err != nil {
-			panic(fmt.Sprintf("cannot get identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err))
+			return errors.Wrapf(err, "cannot get identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err)
 		}
 		s.bccspMspsByIdentity[id.String()] = msp
 		logger.Debugf("add bccsp msp for id %s, identity [%s]", name+"@"+enrollmentID, id.String())
@@ -325,6 +330,7 @@ func (s *service) AddMSP(name string, mspType string, enrollmentID string, Ident
 		s.mspsByEnrollmentID[enrollmentID] = msp
 	}
 	s.msps = append(s.msps, msp)
+	return nil
 }
 
 func (s *service) PutIdentityLoader(idType string, loader driver.IdentityLoader) {
diff --git a/platform/fabric/core/generic/transaction/transasction.go b/platform/fabric/core/generic/transaction/transasction.go
@@ -547,16 +547,16 @@ func (t *Transaction) StoreTransient() error {
 	return t.channel.MetadataService().StoreTransient(t.ID(), t.TTransient)
 }
 
-func (t *Transaction) ProposalResponses() []driver.ProposalResponse {
+func (t *Transaction) ProposalResponses() ([]driver.ProposalResponse, error) {
 	var res []driver.ProposalResponse
 	for _, resp := range t.TProposalResponses {
 		r, err := NewProposalResponseFromResponse(resp)
 		if err != nil {
-			panic(err)
+			return nil, errors.Wrapf(err, "failed creating proposal response")
 		}
 		res = append(res, r)
 	}
-	return res
+	return res, nil
 }
 
 func (t *Transaction) ProposalResponse() ([]byte, error) {
@@ -574,7 +574,11 @@ func (t *Transaction) Envelope() (driver.Envelope, error) {
 		logger.Errorf("signer not found for %s while creating tx envelope for ordering [%s]", signerID.UniqueID(), err)
 		return nil, errors.Wrapf(err, "signer not found for %s while creating tx envelope for ordering", signerID.UniqueID())
 	}
-	env, err := fabricutils.CreateEndorserSignedTX(&signerWrapper{signerID, signer}, t.Proposal(), t.ProposalResponses()...)
+	proposalResponses, err := t.ProposalResponses()
+	if err != nil {
+		return nil, errors.WithMessagef(err, "failed getting proposalResponses")
+	}
+	env, err := fabricutils.CreateEndorserSignedTX(&signerWrapper{signerID, signer}, t.Proposal(), proposalResponses...)
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not assemble transaction")
 	}
@@ -645,7 +649,7 @@ func (t *Transaction) getProposalResponse(signer SerializableSigner) (*pb.Propos
 
 	signedProposal := t.SignedProposal()
 	if signedProposal == nil {
-		panic("signed proposal must not be nil")
+		return nil, errors.Errorf("signed proposal is nil")
 	}
 	response := &pb.Response{
 		Status:  200,
diff --git a/platform/fabric/driver/chaincode.go b/platform/fabric/driver/chaincode.go
@@ -27,7 +27,7 @@ type ChaincodeInvocation interface {
 
 	Submit() (string, []byte, error)
 
-	WithTransientEntry(k string, v interface{}) ChaincodeInvocation
+	WithTransientEntry(k string, v interface{}) (ChaincodeInvocation, error)
 
 	WithEndorsersByMSPIDs(mspIDs ...string) ChaincodeInvocation
 
diff --git a/platform/fabric/driver/id.go b/platform/fabric/driver/id.go
@@ -14,5 +14,5 @@ import (
 type IdentityProvider interface {
 	// Identity returns the Fabric identity bound to the passed label.
 	// If not Fabric identity is associated to the label, it returns the the SFC identity bound to that label.
-	Identity(label string) view.Identity
+	Identity(label string) (view.Identity, error)
 }
diff --git a/platform/fabric/driver/membership.go b/platform/fabric/driver/membership.go
@@ -25,7 +25,7 @@ type IdentityInfo struct {
 
 type LocalMembership interface {
 	DefaultIdentity() view.Identity
-	AnonymousIdentity() view.Identity
+	AnonymousIdentity() (view.Identity, error)
 	IsMe(id view.Identity) bool
 	DefaultSigningIdentity() SigningIdentity
 	RegisterX509MSP(id string, path string, mspID string) error
diff --git a/platform/fabric/driver/transaction.go b/platform/fabric/driver/transaction.go
@@ -119,7 +119,7 @@ type Transaction interface {
 	AppendProposalResponse(response ProposalResponse) error
 	ProposalHasBeenEndorsedBy(party view.Identity) error
 	StoreTransient() error
-	ProposalResponses() []ProposalResponse
+	ProposalResponses() ([]ProposalResponse, error)
 	ProposalResponse() ([]byte, error)
 	BytesNoTransient() ([]byte, error)
 	Envelope() (Envelope, error)
diff --git a/platform/fabric/identity.go b/platform/fabric/identity.go
@@ -20,6 +20,6 @@ func (i *IdentityProvider) DefaultIdentity() view.Identity {
 	return i.localMembership.DefaultIdentity()
 }
 
-func (i *IdentityProvider) Identity(label string) view.Identity {
+func (i *IdentityProvider) Identity(label string) (view.Identity, error) {
 	return i.ip.Identity(label)
 }
diff --git a/platform/fabric/membership.go b/platform/fabric/membership.go
@@ -81,7 +81,7 @@ func (s *LocalMembership) IsMe(id view.Identity) bool {
 	return s.network.LocalMembership().IsMe(id)
 }
 
-func (s *LocalMembership) AnonymousIdentity() view.Identity {
+func (s *LocalMembership) AnonymousIdentity() (view.Identity, error) {
 	return s.network.LocalMembership().AnonymousIdentity()
 }
 
diff --git a/platform/fabric/services/endorser/transaction.go b/platform/fabric/services/endorser/transaction.go
@@ -147,9 +147,14 @@ func (t *Transaction) AppendProposalResponse(response *fabric.ProposalResponse)
 
 // HasBeenEndorsedBy returns nil if each passed party has signed this transaction
 func (t *Transaction) HasBeenEndorsedBy(parties ...view.Identity) error {
+	responses, err := t.Transaction.ProposalResponses()
+	if err != nil {
+		return err
+	}
+
 	for _, party := range parties {
 		found := false
-		for _, response := range t.Transaction.ProposalResponses() {
+		for _, response := range responses {
 			if bytes.Equal(response.Endorser(), party) {
 				found = true
 				break
@@ -162,13 +167,17 @@ func (t *Transaction) HasBeenEndorsedBy(parties ...view.Identity) error {
 	return nil
 }
 
-func (t *Transaction) GetSignatureOf(party view.Identity) []byte {
-	for _, response := range t.Transaction.ProposalResponses() {
+func (t *Transaction) GetSignatureOf(party view.Identity) ([]byte, error) {
+	responses, err := t.Transaction.ProposalResponses()
+	if err != nil {
+		return nil, err
+	}
+	for _, response := range responses {
 		if bytes.Equal(response.Endorser(), party) {
-			return response.EndorserSignature()
+			return response.EndorserSignature(), nil
 		}
 	}
-	return nil
+	return nil, nil
 }
 
 // Namespaces returns the list of namespaces this transaction contains.
@@ -223,7 +232,10 @@ func (t *Transaction) Envelope() (*fabric.Envelope, error) {
 }
 
 func (t *Transaction) ProposalResponses() ([][]byte, error) {
-	prs := t.Transaction.ProposalResponses()
+	prs, err := t.Transaction.ProposalResponses()
+	if err != nil {
+		return nil, err
+	}
 	res := [][]byte{}
 	for _, pr := range prs {
 		prRaw, err := pr.Bytes()
diff --git a/platform/fabric/services/state/transaction.go b/platform/fabric/services/state/transaction.go
@@ -59,11 +59,15 @@ func NewAnonymousTransaction(context view.Context) (*Transaction, error) {
 	if err != nil {
 		return nil, err
 	}
+	anonIdentity, err := fns.LocalMembership().AnonymousIdentity()
+	if err != nil {
+		return nil, errors.WithMessagef(err, "failed getting anonymous identity")
+	}
 	_, tx, err := endorser.NewTransactionWithSigner(
 		context,
 		fns.Name(),
 		fns.ConfigService().DefaultChannel(),
-		fns.LocalMembership().AnonymousIdentity(),
+		anonIdentity,
 	)
 	if err != nil {
 		return nil, err
diff --git a/platform/fabric/transaction.go b/platform/fabric/transaction.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+	"github.com/pkg/errors"
 )
 
 type VerifierProvider = driver.VerifierProvider
@@ -329,12 +330,16 @@ func (t *Transaction) StoreTransient() error {
 	return t.tx.StoreTransient()
 }
 
-func (t *Transaction) ProposalResponses() []*ProposalResponse {
+func (t *Transaction) ProposalResponses() ([]*ProposalResponse, error) {
 	var res []*ProposalResponse
-	for _, resp := range t.tx.ProposalResponses() {
+	responses, err := t.tx.ProposalResponses()
+	if err != nil {
+		return nil, errors.WithMessage(err, "failed to fetch proposal responses")
+	}
+	for _, resp := range responses {
 		res = append(res, &ProposalResponse{pr: resp})
 	}
-	return res
+	return res, nil
 }
 
 func (t *Transaction) ProposalResponse() ([]byte, error) {
diff --git a/platform/view/services/assert/assert.go b/platform/view/services/assert/assert.go
@@ -9,6 +9,7 @@ package assert
 import (
 	"fmt"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/test-go/testify/assert"
 )
 
@@ -30,6 +31,15 @@ func NotNil(object interface{}, msgAndArgs ...interface{}) {
 	assert.NotNil(&panickier{releasers: releasers}, object, ma...)
 }
 
+// ValidIdentity checks that the passed error is nil and id is not empty
+func ValidIdentity(id view.Identity, err error, msgAndArgs ...interface{}) view.Identity {
+	ma, releasers := extractReleasers(msgAndArgs...)
+	p := &panickier{releasers: releasers}
+	assert.NoError(p, err, ma...)
+	assert.False(p, id.IsNone(), ma...)
+	return id
+}
+
 // NoError checks that the passed error is nil, it panics otherwise
 func NoError(err error, msgAndArgs ...interface{}) {
 	ma, releasers := extractReleasers(msgAndArgs...)

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func (a *TransferView) Call(ctx view.Context) (interface{}, error) {`
`66`	`66`	`)`
`67`	`67`	`assert.NoError(err, "failed getting sender MSP-ID")`
`68`	`68`	`recipientMSPID, err := ch.MSPManager().GetMSPIdentifier(`
`69`		`- fns.IdentityProvider().Identity(a.Recipient.UniqueID()),`
	`69`	`+ assert.ValidIdentity(fns.IdentityProvider().Identity(a.Recipient.UniqueID())),`
`70`	`70`	`)`
`71`	`71`	`assert.NoError(err, "failed getting recipient MSP-ID")`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -193,16 +193,16 @@ func (i *Invoke) WithContext(context context.Context) driver.ChaincodeInvocation`
`193`	`193`	`return i`
`194`	`194`	`}`
`195`	`195`
`196`		`-func (i *Invoke) WithTransientEntry(k string, v interface{}) driver.ChaincodeInvocation {`
	`196`	`+func (i *Invoke) WithTransientEntry(k string, v interface{}) (driver.ChaincodeInvocation, error) {`
`197`	`197`	`if i.TransientMap == nil {`
`198`	`198`	`i.TransientMap = map[string][]byte{}`
`199`	`199`	`}`
`200`	`200`	`b, err := i.toBytes(v)`
`201`	`201`	`if err != nil {`
`202`		`- panic(err)`
	`202`	`+ return nil, errors.WithMessagef(err, "error converting transient entry to bytes")`
`203`	`203`	`}`
`204`	`204`	`i.TransientMap[k] = b`
`205`		`- return i`
	`205`	`+ return i, nil`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`func (i *Invoke) WithEndorsersByMSPIDs(mspIDs ...string) driver.ChaincodeInvocation {`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ package id`
`8`	`8`
`9`	`9`	`import (`
`10`	`10`	`"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"`
	`11`	`+ "github.com/pkg/errors"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`type EndpointService interface {`
`@@ -22,10 +23,10 @@ func NewProvider(endpointService EndpointService) (*provider, error) {`
`22`	`23`	`return &provider{endpointService: endpointService}, nil`
`23`	`24`	`}`
`24`	`25`
`25`		`-func (p *provider) Identity(label string) view.Identity {`
	`26`	`+func (p *provider) Identity(label string) (view.Identity, error) {`
`26`	`27`	`id, err := p.endpointService.GetIdentity(label)`
`27`	`28`	`if err != nil {`
`28`		`- panic(err)`
	`29`	`+ return nil, errors.WithMessagef(err, "failed getting identity [%s]", label)`
`29`	`30`	`}`
`30`		`- return id`
	`31`	`+ return id, nil`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ func NewProvider(conf1 *m.MSPConfig, signerService mspdriver.SignerService, sigT`
`182`	`182`	`case Any:`
`183`	`183`	`verType = bccsp.BestEffort`
`184`	`184`	`default:`
`185`		`- panic("invalid sig type")`
	`185`	`+ return nil, errors.Errorf("unknown verification type [%d]", sigType)`
`186`	`186`	`}`
`187`	`187`	`if verType == bccsp.BestEffort {`
`188`	`188`	`sigType = bccsp.Standard`
`@@ -331,7 +331,7 @@ func (p Provider) Identity(opts driver.IdentityOptions) (view.Identity, []byte`
`331`	`331`	`return nil, nil, err`
`332`	`332`	`}`
`333`	`333`	`default:`
`334`		`- panic("invalid sig type")`
	`334`	`+ return nil, nil, errors.Errorf("unsupported signing type [%d]", sigType)`
`335`	`335`	`}`
`336`	`336`	`return raw, infoRaw, nil`
`337`	`337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0`
`7`	`7`	`package msp`
`8`	`8`
`9`	`9`	`import (`
`10`		`- "fmt"`
`11`	`10`	`"sync"`
`12`	`11`
`13`	`12`	`"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/msp/driver"`
`@@ -103,8 +102,7 @@ func (s *service) Config() driver.Config {`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`func (s *service) DefaultMSP() string {`
`106`		`- // TODO implement me`
`107`		`- panic("implement me")`
	`105`	`+ return s.config.DefaultMSP()`
`108`	`106`	`}`
`109`	`107`
`110`	`108`	`func (s *service) SignerService() driver.SignerService {`
`@@ -131,20 +129,23 @@ func (s *service) DefaultIdentity() view.Identity {`
`131`	`129`	`return s.defaultIdentity`
`132`	`130`	`}`
`133`	`131`
`134`		`-func (s *service) AnonymousIdentity() view.Identity {`
`135`		`- id := s.Identity("idemix")`
	`132`	`+func (s *service) AnonymousIdentity() (view.Identity, error) {`
	`133`	`+ id, err := s.Identity("idemix")`
	`134`	`+ if err != nil {`
	`135`	+ return nil, errors.WithMessagef(err, "failed to get default anonymous identity labelled `idemix`")
	`136`	`+ }`
`136`	`137`	`if err := s.binderService.Bind(s.defaultViewIdentity, id); err != nil {`
`137`		`- panic(err)`
	`138`	`+ return nil, errors.WithMessagef(err, "failed to bind identity [%s] to default [%s]", id, s.defaultViewIdentity)`
`138`	`139`	`}`
`139`		`- return id`
	`140`	`+ return id, nil`
`140`	`141`	`}`
`141`	`142`
`142`		`-func (s *service) Identity(label string) view.Identity {`
	`143`	`+func (s *service) Identity(label string) (view.Identity, error) {`
`143`	`144`	`id, err := s.GetIdentityByID(label)`
`144`	`145`	`if err != nil {`
`145`		`- panic(err)`
	`146`	`+ return nil, errors.WithMessagef(err, "failed to get identity [%s]", label)`
`146`	`147`	`}`
`147`		`- return id`
	`148`	`+ return id, nil`
`148`	`149`	`}`
`149`	`150`
`150`	`151`	`func (s *service) IsMe(id view.Identity) bool {`
`@@ -253,7 +254,9 @@ func (s *service) RegisterIdemixMSP(id string, path string, mspID string) error`
`253`	`254`	`}`
`254`	`255`
`255`	`256`	`s.deserializerManager.AddDeserializer(provider)`
`256`		`- s.AddMSP(id, IdemixMSP, provider.EnrollmentID(), idemix.NewIdentityCache(provider.Identity, s.cacheSize, nil).Identity)`
	`257`	`+ if err := s.AddMSP(id, IdemixMSP, provider.EnrollmentID(), idemix.NewIdentityCache(provider.Identity, s.cacheSize, nil).Identity); err != nil {`
	`258`	`+ return errors.Wrapf(err, "failed adding idemix msp [%s] to [%s]", id, path)`
	`259`	`+ }`
`257`	`260`	`logger.Debugf("added IdemixMSP msp for id %s with cache of size %d", id+"@"+provider.EnrollmentID(), s.cacheSize)`
`258`	`261`	`return nil`
`259`	`262`	`}`
`@@ -268,7 +271,9 @@ func (s *service) RegisterX509MSP(id string, path string, mspID string) error {`
`268`	`271`	`}`
`269`	`272`
`270`	`273`	`s.deserializerManager.AddDeserializer(provider)`
`271`		`- s.AddMSP(id, BccspMSP, provider.EnrollmentID(), provider.Identity)`
	`274`	`+ if err := s.AddMSP(id, BccspMSP, provider.EnrollmentID(), provider.Identity); err != nil {`
	`275`	`+ return errors.Wrapf(err, "failed adding bccsp msp [%s] to [%s]", id, path)`
	`276`	`+ }`
`272`	`277`
`273`	`278`	`return nil`
`274`	`279`	`}`
`@@ -292,14 +297,14 @@ func (s *service) Refresh() error {`
`292`	`297`	`return nil`
`293`	`298`	`}`
`294`	`299`
`295`		`-func (s *service) AddMSP(name string, mspType string, enrollmentID string, IdentityGetter fdriver.GetIdentityFunc) {`
	`300`	`+func (s *service) AddMSP(name string, mspType string, enrollmentID string, IdentityGetter fdriver.GetIdentityFunc) error {`
`296`	`301`	`if mspType == BccspMSP && s.binderService != nil {`
`297`	`302`	`id, _, err := IdentityGetter(nil)`
`298`	`303`	`if err != nil {`
`299`		`- panic(fmt.Sprintf("cannot get identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err))`
	`304`	`+ return errors.Wrapf(err, "cannot get identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err)`
`300`	`305`	`}`
`301`	`306`	`if err := s.binderService.Bind(s.defaultViewIdentity, id); err != nil {`
`302`		`- panic(fmt.Sprintf("cannot bind identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err))`
	`307`	`+ return errors.Wrapf(err, "cannot bind identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err)`
`303`	`308`	`}`
`304`	`309`	`}`
`305`	`310`
`@@ -312,7 +317,7 @@ func (s *service) AddMSP(name string, mspType string, enrollmentID string, Ident`
`312`	`317`	`if mspType == BccspMSP {`
`313`	`318`	`id, _, err := IdentityGetter(nil)`
`314`	`319`	`if err != nil {`
`315`		`- panic(fmt.Sprintf("cannot get identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err))`
	`320`	`+ return errors.Wrapf(err, "cannot get identity for [%s,%s,%s][%s]", name, mspType, enrollmentID, err)`
`316`	`321`	`}`
`317`	`322`	`s.bccspMspsByIdentity[id.String()] = msp`
`318`	`323`	`logger.Debugf("add bccsp msp for id %s, identity [%s]", name+"@"+enrollmentID, id.String())`
`@@ -325,6 +330,7 @@ func (s *service) AddMSP(name string, mspType string, enrollmentID string, Ident`
`325`	`330`	`s.mspsByEnrollmentID[enrollmentID] = msp`
`326`	`331`	`}`
`327`	`332`	`s.msps = append(s.msps, msp)`
	`333`	`+ return nil`
`328`	`334`	`}`
`329`	`335`
`330`	`336`	`func (s *service) PutIdentityLoader(idType string, loader driver.IdentityLoader) {`
Original file line number	Diff line number	Diff line change
`@@ -547,16 +547,16 @@ func (t *Transaction) StoreTransient() error {`
`547`	`547`	`return t.channel.MetadataService().StoreTransient(t.ID(), t.TTransient)`
`548`	`548`	`}`
`549`	`549`
`550`		`-func (t *Transaction) ProposalResponses() []driver.ProposalResponse {`
	`550`	`+func (t *Transaction) ProposalResponses() ([]driver.ProposalResponse, error) {`
`551`	`551`	`var res []driver.ProposalResponse`
`552`	`552`	`for _, resp := range t.TProposalResponses {`
`553`	`553`	`r, err := NewProposalResponseFromResponse(resp)`
`554`	`554`	`if err != nil {`
`555`		`- panic(err)`
	`555`	`+ return nil, errors.Wrapf(err, "failed creating proposal response")`
`556`	`556`	`}`
`557`	`557`	`res = append(res, r)`
`558`	`558`	`}`
`559`		`- return res`
	`559`	`+ return res, nil`
`560`	`560`	`}`
`561`	`561`
`562`	`562`	`func (t *Transaction) ProposalResponse() ([]byte, error) {`
`@@ -574,7 +574,11 @@ func (t *Transaction) Envelope() (driver.Envelope, error) {`
`574`	`574`	`logger.Errorf("signer not found for %s while creating tx envelope for ordering [%s]", signerID.UniqueID(), err)`
`575`	`575`	`return nil, errors.Wrapf(err, "signer not found for %s while creating tx envelope for ordering", signerID.UniqueID())`
`576`	`576`	`}`
`577`		`- env, err := fabricutils.CreateEndorserSignedTX(&signerWrapper{signerID, signer}, t.Proposal(), t.ProposalResponses()...)`
	`577`	`+ proposalResponses, err := t.ProposalResponses()`
	`578`	`+ if err != nil {`
	`579`	`+ return nil, errors.WithMessagef(err, "failed getting proposalResponses")`
	`580`	`+ }`
	`581`	`+ env, err := fabricutils.CreateEndorserSignedTX(&signerWrapper{signerID, signer}, t.Proposal(), proposalResponses...)`
`578`	`582`	`if err != nil {`
`579`	`583`	`return nil, errors.WithMessage(err, "could not assemble transaction")`
`580`	`584`	`}`
`@@ -645,7 +649,7 @@ func (t Transaction) getProposalResponse(signer SerializableSigner) (pb.Propos`
`645`	`649`
`646`	`650`	`signedProposal := t.SignedProposal()`
`647`	`651`	`if signedProposal == nil {`
`648`		`- panic("signed proposal must not be nil")`
	`652`	`+ return nil, errors.Errorf("signed proposal is nil")`
`649`	`653`	`}`
`650`	`654`	`response := &pb.Response{`
`651`	`655`	`Status: 200,`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ import (`
`14`	`14`	`type IdentityProvider interface {`
`15`	`15`	`// Identity returns the Fabric identity bound to the passed label.`
`16`	`16`	`// If not Fabric identity is associated to the label, it returns the the SFC identity bound to that label.`
`17`		`- Identity(label string) view.Identity`
	`17`	`+ Identity(label string) (view.Identity, error)`
`18`	`18`	`}`