Minor: make LedgerTransaction implement the NamedByHash interface, for improved consistency

core/src/main/kotlin/core/TransactionVerification.kt

@@ -26,7 +26,7 @@ class TransactionGroup(val transactions: Set<LedgerTransaction>, val nonVerified
         // Cycles should be impossible due to the use of hashes as pointers.
         check(transactions.intersect(nonVerifiedRoots).isEmpty())
 
-        val hashToTXMap: Map<SecureHash, List<LedgerTransaction>> = (transactions + nonVerifiedRoots).groupBy { it.hash }
+        val hashToTXMap: Map<SecureHash, List<LedgerTransaction>> = (transactions + nonVerifiedRoots).groupBy { it.id }
         val refToConsumingTXMap = hashMapOf<StateRef, LedgerTransaction>()
 
         val resolved = HashSet<TransactionForVerification>(transactions.size)
@@ -43,7 +43,7 @@ class TransactionGroup(val transactions: Set<LedgerTransaction>, val nonVerified
                 // Look up the output in that transaction by index.
                 inputs.add(ltx.outputs[ref.index])
             }
-            resolved.add(TransactionForVerification(inputs, tx.outputs, tx.attachments, tx.commands, tx.hash))
+            resolved.add(TransactionForVerification(inputs, tx.outputs, tx.attachments, tx.commands, tx.id))
         }
 
         for (tx in resolved)

core/src/main/kotlin/core/Transactions.kt

@@ -319,8 +319,8 @@ data class LedgerTransaction(
         /** Arbitrary data passed to the program of each input state. */
         val commands: List<AuthenticatedObject<CommandData>>,
         /** The hash of the original serialised WireTransaction */
-        val hash: SecureHash
-) {
+        override val id: SecureHash
+) : NamedByHash {
     @Suppress("UNCHECKED_CAST")
-    fun <T : ContractState> outRef(index: Int) = StateAndRef(outputs[index] as T, StateRef(hash, index))
+    fun <T : ContractState> outRef(index: Int) = StateAndRef(outputs[index] as T, StateRef(id, index))
 }

src/test/kotlin/contracts/CommercialPaperTests.kt

@@ -159,7 +159,7 @@ class CommercialPaperTestsGeneric {
 
     fun cashOutputsToWallet(vararg states: Cash.State): Pair<LedgerTransaction, List<StateAndRef<Cash.State>>> {
         val ltx = LedgerTransaction(emptyList(), emptyList(), listOf(*states), emptyList(), SecureHash.randomSHA256())
-        return Pair(ltx, states.mapIndexed { index, state -> StateAndRef(state, StateRef(ltx.hash, index)) })
+        return Pair(ltx, states.mapIndexed { index, state -> StateAndRef(state, StateRef(ltx.id, index)) })
     }
 
     @Test

src/test/kotlin/contracts/CrowdFundTests.kt

@@ -95,7 +95,7 @@ class CrowdFundTests {
 
     fun cashOutputsToWallet(vararg states: Cash.State): Pair<LedgerTransaction, List<StateAndRef<Cash.State>>> {
         val ltx = LedgerTransaction(emptyList(), emptyList(), listOf(*states), emptyList(), SecureHash.randomSHA256())
-        return Pair(ltx, states.mapIndexed { index, state -> StateAndRef(state, StateRef(ltx.hash, index)) })
+        return Pair(ltx, states.mapIndexed { index, state -> StateAndRef(state, StateRef(ltx.id, index)) })
     }
 
     @Test

src/test/kotlin/core/TransactionGroupTests.kt

@@ -67,7 +67,7 @@ class TransactionGroupTests {
                 verify()
             }
             assertEquals(StateRef(t.id, 0), e.conflictRef)
-            assertEquals(setOf(conflict1.id, conflict2.id), setOf(e.tx1.hash, e.tx2.hash))
+            assertEquals(setOf(conflict1.id, conflict2.id), setOf(e.tx1.id, e.tx2.id))
         }
     }
 

src/test/kotlin/core/testutils/TestUtils.kt

@@ -300,7 +300,7 @@ class TransactionGroupDSL<T : ContractState>(private val stateType: Class<T>) {
     }
 
     fun labelForTransaction(tx: WireTransaction): String? = txnToLabelMap[tx.id]
-    fun labelForTransaction(tx: LedgerTransaction): String? = txnToLabelMap[tx.hash]
+    fun labelForTransaction(tx: LedgerTransaction): String? = txnToLabelMap[tx.id]
 
     @Deprecated("Does not nest ", level = DeprecationLevel.ERROR)
     fun transactionGroup(body: TransactionGroupDSL<T>.() -> Unit) {

src/test/kotlin/core/visualiser/GroupToGraphConversion.kt

@@ -22,7 +22,7 @@ class GraphVisualiser(val dsl: TransactionGroupDSL<in ContractState>) {
         for ((txIndex, tx) in (tg.transactions + tg.nonVerifiedRoots).withIndex()) {
             val txNode = graph.addNode<Node>("tx$txIndex")
             if (tx !in tg.nonVerifiedRoots)
-                txNode.label = dsl.labelForTransaction(tx).let { it ?: "TX ${tx.hash.prefixChars()}" }
+                txNode.label = dsl.labelForTransaction(tx).let { it ?: "TX ${tx.id.prefixChars()}" }
             txNode.styleClass = "tx"
 
             // Now create a vertex for each output state.