Skip to content

Commit

Permalink
Fix broken merge (digital-asset#9480)
Browse files Browse the repository at this point in the history
changelog_begin
changelog_end
  • Loading branch information
cocreature authored Apr 23, 2021
1 parent 176b17a commit e3f1f55
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,7 @@ private[lf] object SBuiltin {
val gkey = GlobalKey(templateId, keyWithMaintainers.key)
// check if we find it locally
onLedger.ptx.keys.get(gkey) match {
case Some(Some(coid)) if onLedger.localContracts.contains(coid) =>
case Some(Some(coid)) if onLedger.ptx.localContracts.contains(coid) =>
val cachedContract = onLedger.cachedContracts
.get(coid)
.getOrElse(crash(s"Local contract $coid not in cachedContracts"))
Expand Down Expand Up @@ -1286,7 +1286,7 @@ private[lf] object SBuiltin {
onLedger.ptx.keys.get(gkey) match {
case Some(None) =>
crash(s"Could not find key $gkey")
case Some(Some(coid)) if onLedger.localContracts.contains(coid) =>
case Some(Some(coid)) if onLedger.ptx.localContracts.contains(coid) =>
val cachedContract = onLedger.cachedContracts
.get(coid)
.getOrElse(crash(s"Local contract $coid not in cachedContracts"))
Expand Down

0 comments on commit e3f1f55

Please sign in to comment.