approval: no need to process RWSet #1165 (#1166)

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

token/core/common/backend.go

@@ -39,7 +39,7 @@ func (b *Backend) HasBeenSignedBy(id driver.Identity, verifier driver.Verifier)
 	sigma := b.Sigs[b.Cursor]
 	b.Cursor++
 
-	b.Logger.Infof("verify signature [%s][%s][%s]", id, logging.Base64(sigma), utils.Hashable(b.Message))
+	b.Logger.Debugf("verify signature [%s][%s][%s]", id, logging.Base64(sigma), utils.Hashable(b.Message))
 
 	return sigma, verifier.Verify(b.Message, sigma)
 }

token/services/network/fabric/endorsement/approval.go

@@ -38,6 +38,8 @@ type RequestApprovalView struct {
 }
 
 func (r *RequestApprovalView) Call(context view.Context) (interface{}, error) {
+	logger.DebugfContext(context.Context(), "request approval...")
+
 	_, tx, err := endorser.NewTransaction(
 		context,
 		fabric2.WithCreator(r.TxID.Creator),
@@ -72,25 +74,24 @@ func (r *RequestApprovalView) Call(context view.Context) (interface{}, error) {
 		}
 	}
 
-	logger.DebugfContext(context.Context(), "Request Endorsement on tx [%s] to [%v]...", tx.ID(), r.Endorsers)
+	logger.DebugfContext(context.Context(), "request endorsement on tx [%s] to [%v]...", tx.ID(), r.Endorsers)
 	_, err = context.RunView(endorser.NewParallelCollectEndorsementsOnProposalView(
 		tx,
 		r.Endorsers...,
 	).WithTimeout(2 * time.Minute))
 	if err != nil {
 		return nil, errors.WithMessagef(err, "failed to collect endorsements")
 	}
-	logger.DebugfContext(context.Context(), "Request Endorsement on tx [%s] to [%v]...done", tx.ID(), r.Endorsers)
+	logger.DebugfContext(context.Context(), "request endorsement done")
 
-	rws, err := tx.RWSet()
+	// Return envelope
+	env, err := tx.Envelope()
 	if err != nil {
-		return nil, errors.WithMessagef(err, "failed to get rws")
+		return nil, errors.WithMessagef(err, "failed to retrieve envelope for endorsement")
 	}
-	rws.Done()
-	logger.DebugfContext(context.Context(), "[%s] found [%d] nss [%v]", tx.ID(), len(rws.Namespaces()), rws.Namespaces())
+	logger.DebugfContext(context.Context(), "envelope ready")
 
-	// Return envelope
-	return tx.Envelope()
+	return env, nil
 }
 
 type Translator interface {