[CORDA-2486] Improve transaction deserialisation errors and fix possible migration issue (#4761)

* Improve error when transaction deserialisation fails and move migrations for finance to contracts CorDapp

* Revert move of migrations and errors thrown from CordaRPCOps

* Ensure VaultQueryException is thrown from vault queries and remove unused import

* Improve error reporting from VaultQueryException

* Fix API break

* Fix vault query test failure due to exception change

core/src/main/kotlin/net/corda/core/internal/TransactionUtils.kt

@@ -79,11 +79,17 @@ fun <T : Any> deserialiseComponentGroup(componentGroups: List<ComponentGroup>,
         } catch (e: MissingAttachmentsException) {
             throw e
         } catch (e: Exception) {
-            throw Exception("Malformed transaction, $groupEnum at index $internalIndex cannot be deserialised", e)
+            throw TransactionDeserialisationException(groupEnum, internalIndex, e)
         }
     }
 }
 
+/**
+ * Exception raised if an error was encountered while attempting to deserialise a component group in a transaction.
+ */
+class TransactionDeserialisationException(groupEnum: ComponentGroupEnum, index: Int, cause: Exception):
+        Exception("Failed to deserialise group $groupEnum at index $index in transaction: ${cause.message}", cause)
+
 /**
  * Method to deserialise Commands from its two groups:
  *  * COMMANDS_GROUP which contains the CommandData part

core/src/main/kotlin/net/corda/core/node/services/VaultService.kt

@@ -518,7 +518,9 @@ inline fun <reified T : ContractState> VaultService.trackBy(criteria: QueryCrite
     return _trackBy(criteria, paging, sorting, T::class.java)
 }
 
-class VaultQueryException(description: String) : FlowException(description)
+class VaultQueryException(description: String, cause: Exception? = null) : FlowException(description, cause) {
+    constructor(description: String) : this(description, null)
+}
 
 class StatesNotAvailableException(override val message: String?, override val cause: Throwable? = null) : FlowException(message, cause) {
     override fun toString() = "Soft locking error: $message"

node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt

@@ -511,7 +511,13 @@ class NodeVaultService(
 
     @Throws(VaultQueryException::class)
     override fun <T : ContractState> _queryBy(criteria: QueryCriteria, paging: PageSpecification, sorting: Sort, contractStateType: Class<out T>): Vault.Page<T> {
-        return _queryBy(criteria, paging, sorting, contractStateType, false)
+        try {
+            return _queryBy(criteria, paging, sorting, contractStateType, false)
+        } catch (e: VaultQueryException) {
+            throw e
+        } catch (e: Exception) {
+            throw VaultQueryException("An error occurred while attempting to query the vault: ${e.message}", e)
+        }
     }
 
     @Throws(VaultQueryException::class)

node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt

@@ -825,7 +825,7 @@ abstract class VaultQueryTestsBase : VaultQueryParties {
             assertThat(resultsUnlockedAndByLockIds.states).hasSize(5)
 
             // missing lockId
-            expectedEx.expect(IllegalArgumentException::class.java)
+            expectedEx.expect(VaultQueryException::class.java)
             expectedEx.expectMessage("Must specify one or more lockIds")
             val criteriaMissingLockId = VaultQueryCriteria(softLockingCondition = SoftLockingCondition(SoftLockingType.UNLOCKED_AND_SPECIFIED))
             vaultService.queryBy<ContractState>(criteriaMissingLockId)