93 responder

package.json

@@ -31,10 +31,11 @@
   },
   "homepage": "https://github.com/PISAresearch/pisa#readme",
   "dependencies": {
+    "@types/sinon": "^7.0.11",
     "ethers": "^4.0.7",
     "express": "^4.16.4",
     "express-http-context": "^1.2.0",
-    "ganache-core": "^2.5.3",
+    "ganache-core": "^2.5.4",
     "request": "^2.88.0",
     "request-promise": "^4.2.2",
     "rwlock": "^5.0.0",
@@ -49,6 +50,7 @@
     "@types/express": "^4.16.0",
     "@types/fs-extra": "^5.0.5",
     "@types/ganache-core": "^2.1.1",
+    "@types/lolex": "^3.1.1",
     "@types/mocha": "^5.2.5",
     "@types/request-promise": "^4.1.42",
     "@types/rwlock": "^5.0.2",
@@ -57,8 +59,11 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "fs-extra": "^7.0.1",
+    "lolex": "^4.0.1",
     "mocha": "^5.2.0",
     "nyc": "^13.1.0",
+    "sinon": "^7.3.1",
+    "sinon-chai": "^3.3.0",
     "tree-kill": "^1.2.1",
     "ts-mockito": "^2.3.1",
     "ts-node": "^7.0.1",

src/dataEntities/appointment.ts

@@ -34,7 +34,7 @@ export interface IEthereumAppointment extends IAppointment {
     formatLog(message: string): string;
     getResponseFunctionName(): string;
     getResponseFunctionArgs(): any[];
-    getResponse(): IEthereumResponse;
+    getResponseData(): IEthereumResponseData;
 }
 
 
@@ -95,9 +95,9 @@ export abstract class EthereumAppointment implements IEthereumAppointment {
     abstract getResponseFunctionArgs(): any[];
 
     /**
-     * Returns the IEthereumResponse object for this appointment
+     * Returns the IEthereumResponseData object for this appointment
      */
-    public getResponse(): IEthereumResponse {
+    public getResponseData(): IEthereumResponseData {
         return {
             contractAddress: this.getContractAddress(),
             contractAbi: this.getContractAbi(),
@@ -110,7 +110,7 @@ export abstract class EthereumAppointment implements IEthereumAppointment {
 /**
  * Represents the necessary data for an on-chain response from Pisa on the Ethereum blockchain.
  */
-export interface IEthereumResponse {
+export interface IEthereumResponseData {
     contractAddress: string,
     contractAbi: any,
     functionName: string,

src/dataEntities/index.ts

@@ -1,4 +1,4 @@
-export { IAppointment, IEthereumAppointment, EthereumAppointment, IEthereumResponse } from "./appointment";
+export { IAppointment, IEthereumAppointment, EthereumAppointment, IEthereumResponseData } from "./appointment";
 export { PublicDataValidationError, PublicInspectionError, ConfigurationError, ApplicationError } from "./errors";
 export { ChannelType } from "./channelType";
 export {

src/integrations/kitsune/index.ts

@@ -8,7 +8,7 @@ import {
     doesPropertyExist,
     isArrayOfStrings,
     PublicDataValidationError,
-    checkAppointment,
+    checkAppointment
 } from "../../dataEntities";
 import { Inspector } from "../../inspector";
 import { PublicInspectionError, ConfigurationError } from "../../dataEntities/errors";