Merge branch 'master' into zach-starter

1 files changed, 3 insertions, 3 deletions

diff --git a/src/server/MemoryDatabase.ts b/src/server/MemoryDatabase.ts
index 1432d91c4..b838cb61b 100644
--- a/src/server/MemoryDatabase.ts
+++ b/src/server/MemoryDatabase.ts
@@ -1,6 +1,6 @@
 import * as mongodb from 'mongodb';
+import { serializedDoctype } from '../fields/ObjectField';
 import { DocumentsCollection, IDatabase } from './IDatabase';
-import { Transferable } from './Message';
 
 export class MemoryDatabase implements IDatabase {
     private db: { [collectionName: string]: { [id: string]: any } } = {};
@@ -81,10 +81,10 @@ export class MemoryDatabase implements IDatabase {
         return Promise.resolve();
     }
 
-    public getDocument(id: string, fn: (result?: Transferable) => void, collectionName = DocumentsCollection): void {
+    public getDocument(id: string, fn: (result?: serializedDoctype) => void, collectionName = DocumentsCollection): void {
         fn(this.getCollection(collectionName)[id]);
     }
-    public getDocuments(ids: string[], fn: (result: Transferable[]) => void, collectionName = DocumentsCollection): void {
+    public getDocuments(ids: string[], fn: (result: serializedDoctype[]) => void, collectionName = DocumentsCollection): void {
         fn(ids.map(id => this.getCollection(collectionName)[id]));
     }