Fixup: Better organisation of code

Author: martintomazic

go/runtime/host/sgx/ecdsa.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/oasisprotocol/oasis-core/go/common/sgx/aesm"
 	"github.com/oasisprotocol/oasis-core/go/common/sgx/pcs"
-	"github.com/oasisprotocol/oasis-core/go/common/sgx/quote"
 	consensus "github.com/oasisprotocol/oasis-core/go/consensus/api"
 	"github.com/oasisprotocol/oasis-core/go/runtime/bundle/component"
 	"github.com/oasisprotocol/oasis-core/go/runtime/host"
@@ -65,16 +64,15 @@ func (ec *teeStateECDSA) Update(ctx context.Context, sp *sgxProvisioner, conn pr
 		return nil, fmt.Errorf("failed to get quote: %w", err)
 	}
 
-	var quotePolicy *quote.Policy
+	var pcsQuotePolicy *pcs.QuotePolicy
 	if ec.cfg.Component.Kind == component.RONL {
-		quotePolicy, err = sgxCommon.GetRONLQuotePolicy(ctx, ec.cfg.ID, ec.cfg.Component.Version, sp.consensus)
+		quotePolicy, err := sgxCommon.GetRONLQuotePolicy(ctx, ec.cfg.ID, ec.cfg.Component.Version, sp.consensus)
 		if err != nil {
 			return nil, fmt.Errorf("failed to fetch RONL quote policy: %w", err)
 		}
-	}
-	var pcsQuotePolicy *pcs.QuotePolicy
-	if quotePolicy != nil {
-		pcsQuotePolicy = quotePolicy.PCS
+		if quotePolicy != nil {
+			pcsQuotePolicy = quotePolicy.PCS
+		}
 	}
 
 	quoteBundle, err := sp.pcs.ResolveQuote(ctx, rawQuote, pcsQuotePolicy)

go/runtime/host/sgx/epid.go

@@ -108,16 +108,15 @@ func (ep *teeStateEPID) update(
 		return nil, fmt.Errorf("error while getting quote: %w", err)
 	}
 
-	var quotePolicy *sgxQuote.Policy
+	var minTCBEvaluationDataNumber uint32
 	if ep.cfg.Component.Kind == component.RONL {
-		quotePolicy, err = sgxCommon.GetRONLQuotePolicy(ctx, ep.cfg.ID, ep.cfg.Component.Version, sp.consensus)
+		quotePolicy, err := sgxCommon.GetRONLQuotePolicy(ctx, ep.cfg.ID, ep.cfg.Component.Version, sp.consensus)
 		if err != nil {
 			return nil, fmt.Errorf("failed to fetch RONL quote policy: %w", err)
 		}
-	}
-	var minTCBEvaluationDataNumber uint32
-	if quotePolicy != nil && quotePolicy.IAS != nil {
-		minTCBEvaluationDataNumber = quotePolicy.IAS.MinTCBEvaluationDataNumber
+		if quotePolicy != nil && quotePolicy.IAS != nil {
+			minTCBEvaluationDataNumber = quotePolicy.IAS.MinTCBEvaluationDataNumber
+		}
 	}
 
 	evidence := ias.Evidence{

go/runtime/host/tdx/qemu.go

@@ -434,8 +434,7 @@ func (p *qemuProvisioner) updateCapabilityTEE(ctx context.Context, hp *sandbox.H
 	rekPub := rspRep.RuntimeCapabilityTEERakReportResponse.RekPub
 	rawQuote := rspRep.RuntimeCapabilityTEERakReportResponse.Report
 
-	// Prepare the quote policy for local verification. In case a policy is not available or it
-	// indicates that TDX is not supported, use the fallback policy so we can provision something.
+	// Use the fallback policy for ROFL components and RONL components with no TDX policy so that provisioning can proceed.
 	fallbackPolicy := &sgxQuote.Policy{
 		PCS: &pcs.QuotePolicy{
 			TCBValidityPeriod:          30,