Merged in remove-commented-out-resolve-tx-proto (pull request #156)

Remove commented out ResolveTransactionsProtocol call as it is not required
This commit is contained in:
Rick Parker 2016-06-16 16:19:03 +01:00
commit 512e304bf1

View File

@ -352,10 +352,6 @@ object TwoPartyDealProtocol {
if (dealToFix.ref != handshake.payload) if (dealToFix.ref != handshake.payload)
throw DealRefMismatchException(dealToFix.ref, handshake.payload) throw DealRefMismatchException(dealToFix.ref, handshake.payload)
// Check the transaction that contains the state which is being resolved.
// We only have a hash here, so if we don't know it already, we have to ask for it.
//subProtocol(ResolveTransactionsProtocol(setOf(handshake.payload.txhash), otherSide))
return handshake return handshake
} }
} }