Remove cid caching from deal proposal

actors/builtin/market/deal.go

@@ -1,9 +1,7 @@
 package market
 
 import (
-	"github.com/filecoin-project/go-state-types/crypto"
 	market0 "github.com/filecoin-project/specs-actors/actors/builtin/market"
-	"github.com/ipfs/go-cid"
 )
 
 //var PieceCIDPrefix = cid.Prefix{
@@ -47,19 +45,8 @@ var PieceCIDPrefix = market0.PieceCIDPrefix
 type DealProposal = market0.DealProposal
 
 // ClientDealProposal is a DealProposal signed by a client
-type ClientDealProposal struct {
-	Proposal        DealProposal
-	ClientSignature crypto.Signature
-
-	// internal cache
-	cid cid.Cid
-}
-
-func (c *ClientDealProposal) ProposalCid() (cid.Cid, error) {
-	var err error
-	if c.cid.Equals(cid.Undef) {
-		c.cid, err = c.Proposal.Cid()
-		return c.cid, err
-	}
-	return c.cid, nil
-}
+// type ClientDealProposal struct {
+// 	Proposal        DealProposal
+// 	ClientSignature crypto.Signature
+// }
+type ClientDealProposal = market0.ClientDealProposal

actors/builtin/market/market_actor.go

@@ -249,7 +249,7 @@ func (a Actor) PublishStorageDeals(rt Runtime, params *PublishStorageDealsParams
 		resolvedAddrs[deal.Proposal.Client] = client
 		deal.Proposal.Client = client
 
-		pcid, err := deal.ProposalCid()
+		pcid, err := deal.Proposal.Cid()
 		builtin.RequireNoErr(rt, err, exitcode.ErrIllegalArgument, "failed to take cid of proposal %d", di)
 
 		// check proposalCids for duplication within message batch

gen/gen.go

@@ -159,7 +159,7 @@ func main() {
 		//market.OnMinerSectorsTerminateParams{}, // Aliased from v0
 		// other types
 		//market.DealProposal{}, // Aliased from v0
-		market.ClientDealProposal{},
+		//market.ClientDealProposal{},
 		market.SectorDeals{},
 		market.SectorWeights{},
 		market.DealState{},