FAB-10195] Bump to fabric 1.2.0

troyronda · troyronda · commit 2ad5906cb2aa · 2018-07-04T16:47:04.000-04:00
Change-Id: I272207bfeff8a207cb2b6426e01d32853dcc93c3
Signed-off-by: Troy Ronda &lt;troy@troyronda.com&gt;
diff --git a/Makefile b/Makefile
@@ -64,9 +64,9 @@ FABRIC_DEV_REGISTRY_PRE_CMD ?= docker login -u docker -p docker nexus3.hyperledg
 
 # Upstream fabric patching (overridable)
 THIRDPARTY_FABRIC_CA_BRANCH ?= master
-THIRDPARTY_FABRIC_CA_COMMIT ?= v1.2.0-rc1
+THIRDPARTY_FABRIC_CA_COMMIT ?= v1.2.0
 THIRDPARTY_FABRIC_BRANCH    ?= master
-THIRDPARTY_FABRIC_COMMIT    ?= v1.2.0-rc1
+THIRDPARTY_FABRIC_COMMIT    ?= v1.2.0
 
 # Force removal of images in cleanup (overridable)
 FIXTURE_DOCKER_REMOVE_FORCE ?= false
diff --git a/internal/github.com/hyperledger/fabric/core/ledger/ledger_interface.go b/internal/github.com/hyperledger/fabric/core/ledger/ledger_interface.go
@@ -249,12 +249,9 @@ func (filter PvtNsCollFilter) Has(ns string, coll string) bool {
 }
 
 // TxSimulationResults captures the details of the simulation results
-// the field 'SimulationBlkHt' captures the approximate height of the blockchain on which
-// the transaction is simulated - this is used to decide when to expire the 'PvtDataSimulationResults' from transient storage
 type TxSimulationResults struct {
 	PubSimulationResults *rwset.TxReadWriteSet
 	PvtSimulationResults *rwset.TxPvtReadWriteSet
-	SimulationBlkHt      uint64
 }
 
 // GetPubSimulationBytes returns the serialized bytes of public readwrite set
diff --git a/third_party/github.com/hyperledger/fabric/protos/peer/transaction.pb.go b/third_party/github.com/hyperledger/fabric/protos/peer/transaction.pb.go

Original file line number	Diff line number	Diff line change
`@@ -249,12 +249,9 @@ func (filter PvtNsCollFilter) Has(ns string, coll string) bool {`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`// TxSimulationResults captures the details of the simulation results`
`252`		`-// the field 'SimulationBlkHt' captures the approximate height of the blockchain on which`
`253`		`-// the transaction is simulated - this is used to decide when to expire the 'PvtDataSimulationResults' from transient storage`
`254`	`252`	`type TxSimulationResults struct {`
`255`	`253`	`PubSimulationResults *rwset.TxReadWriteSet`
`256`	`254`	`PvtSimulationResults *rwset.TxPvtReadWriteSet`
`257`		`- SimulationBlkHt uint64`
`258`	`255`	`}`
`259`	`256`
`260`	`257`	`// GetPubSimulationBytes returns the serialized bytes of public readwrite set`