fix incorrect re-throw

Author: Kiruse

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@terran-one/cw-simulate",
-  "version": "2.8.1-rc.1",
+  "version": "2.8.1-rc.2",
   "description": "Mock blockchain environment for simulating CosmWasm interactions",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package.json

@@ -1,8 +1,8 @@
 import { QuerierBase } from '@terran-one/cosmwasm-vm-js';
-import { Err, Ok, Result } from 'ts-results';
+import { Err, Result } from 'ts-results';
 import { WasmModule, WasmQuery } from './modules/wasm';
 import { BankModule, BankQuery } from './modules/bank';
-import { fromImmutable, toImmutable, Transactional, TransactionalLens } from './store/transactional';
+import { Transactional, TransactionalLens } from './store/transactional';
 import { AppResponse, Binary } from './types';
 
 export interface CWSimulateAppOptions {

src/CWSimulateApp.ts

@@ -50,7 +50,7 @@ export default class Contract {
     instantiateMsg: any,
     logs: DebugLog[]
   ): Result<ContractResponse, string> {
-    if (!this._vm) throw new Error(`No VM for contract ${this.address}`);
+    if (!this._vm) throw new NoVMError(this.address);
     const vm = this._vm;
     const env = this.getExecutionEnv();
     const info = { sender, funds };
@@ -72,7 +72,7 @@ export default class Contract {
   ): Result<ContractResponse, string>
   {
     const vm = this._vm;
-    if (!vm) throw new Error(`No VM for contract ${this.address}`);
+    if (!vm) throw new NoVMError(this.address);
     vm.resetDebugInfo();
 
     const env = this.getExecutionEnv();

src/modules/wasm/contract.ts

@@ -1,6 +1,6 @@
 import { isCollection, isList, isMap, List, Map } from "immutable";
-import { Ok, Result } from "ts-results";
-import { isArrayLike } from "../util";
+import { Err, Ok, Result } from "ts-results";
+import { fromRustResult, isArrayLike, isRustResult, isTSResult } from "../util";
 
 // NEVER_IMMUTIFY is a string because that's easily serializable with different algorithms - symbols are not
 export type NeverImmutify = typeof NEVER_IMMUTIFY;
@@ -66,7 +66,7 @@ export class Transactional {
         })
         .catch(reason => {
           this._data = snapshot;
-          return reason;
+          throw reason;
         })
       }
       else {

src/store/transactional.ts

@@ -26,3 +26,6 @@ export function toRustResult<T>(res: Result<T, string>): RustResult<T> {
     return { error: res.val }
   }
 }
+
+export const isRustResult = <T = unknown>(value: any): value is RustResult<T> => 'ok' in value || 'err' in value;
+export const isTSResult = <T = unknown, E = string>(value: any): value is Result<T, E> => typeof value.ok === 'boolean' && typeof value.err === 'boolean' && 'val' in value;