From e8730ba13dafa79a6f2ca4b6c532650db6537c3f Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Tue, 17 Apr 2018 14:01:58 +0200
Subject: [PATCH] Encode mock results as string

---
 packages/api-format/package.json        |  2 +-
 packages/api-provider/package.json      |  6 +++---
 packages/api-provider/src/mock/state.js |  9 ++++++---
 packages/api-provider/src/mock/types.js |  2 +-
 packages/api/package.json               |  2 +-
 yarn.lock                               | 22 +++++++++++-----------
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/api-format/package.json b/packages/api-format/package.json
index c56bc451ebb0..8b965ab8eca0 100644
--- a/packages/api-format/package.json
+++ b/packages/api-format/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@polkadot/primitives-json": "^0.10.1",
-    "@polkadot/util": "^0.18.5",
+    "@polkadot/util": "^0.18.6",
     "babel-runtime": "^6.26.0"
   }
 }
diff --git a/packages/api-provider/package.json b/packages/api-provider/package.json
index b5eded8505b8..80d6de66829d 100644
--- a/packages/api-provider/package.json
+++ b/packages/api-provider/package.json
@@ -34,9 +34,9 @@
     "nock": "^9.1.0"
   },
   "dependencies": {
-    "@polkadot/util": "^0.18.5",
-    "@polkadot/util-crypto": "^0.18.5",
-    "@polkadot/util-keyring": "^0.18.5",
+    "@polkadot/util": "^0.18.6",
+    "@polkadot/util-crypto": "^0.18.6",
+    "@polkadot/util-keyring": "^0.18.6",
     "babel-runtime": "^6.26.0",
     "isomorphic-fetch": "^2.2.1",
     "websocket": "^1.0.25"
diff --git a/packages/api-provider/src/mock/state.js b/packages/api-provider/src/mock/state.js
index 7dd7349df8b5..a20309c958ea 100644
--- a/packages/api-provider/src/mock/state.js
+++ b/packages/api-provider/src/mock/state.js
@@ -6,6 +6,7 @@
 import type { MockState, MockState$Storage } from './types';
 
 const interfaces = require('@polkadot/api-jsonrpc');
+const u8aToHex = require('@polkadot/util/u8a/toHex');
 const l = require('@polkadot/util/logger')('api-mock');
 
 const SUBSCRIPTIONS = Array.prototype.concat.apply(
@@ -18,9 +19,11 @@ const SUBSCRIPTIONS = Array.prototype.concat.apply(
 );
 
 const REQUESTS = {
-  'state_getStorage': (storage: MockState$Storage, params: Array<mixed>): Uint8Array => {
-    // flowlint-next-line unclear-type:off
-    return storage[((params[0]: any): string)];
+  'state_getStorage': (storage: MockState$Storage, params: Array<mixed>): string => {
+    return u8aToHex(
+      // flowlint-next-line unclear-type:off
+      storage[((params[0]: any): string)]
+    );
   }
 };
 
diff --git a/packages/api-provider/src/mock/types.js b/packages/api-provider/src/mock/types.js
index 187b36a78de8..2ec4e54c02f9 100644
--- a/packages/api-provider/src/mock/types.js
+++ b/packages/api-provider/src/mock/types.js
@@ -21,7 +21,7 @@ export type MockState$Storage = {
 };
 
 export type MockState$Requests = {
-  [string]: (storage: MockState$Storage, params: Array<mixed>) => mixed
+  [string]: (storage: MockState$Storage, params: Array<mixed>) => string
 };
 
 export type MockState = {
diff --git a/packages/api/package.json b/packages/api/package.json
index 3007a83e61dd..ea12aa4336d8 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -33,7 +33,7 @@
     "@polkadot/api-format": "^0.8.13",
     "@polkadot/api-jsonrpc": "^0.8.13",
     "@polkadot/api-provider": "^0.8.13",
-    "@polkadot/util": "^0.18.5",
+    "@polkadot/util": "^0.18.6",
     "babel-runtime": "^6.26.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 3068d0d2da8e..31f77d22af92 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -176,9 +176,9 @@
     tweetnacl "^1.0.0"
     xxhashjs "^0.2.2"
 
-"@polkadot/util-crypto@^0.18.5":
-  version "0.18.5"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.18.5.tgz#59574ff59a488ee5640ecf1862638f3b9647ffa7"
+"@polkadot/util-crypto@^0.18.6":
+  version "0.18.6"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.18.6.tgz#57735d2056d178a3e741ca402ea1ae43267d81f8"
   dependencies:
     babel-runtime "^6.26.0"
     blakejs "^1.1.0"
@@ -194,12 +194,12 @@
     "@polkadot/util-crypto" "^0.18.4"
     babel-runtime "^6.26.0"
 
-"@polkadot/util-keyring@^0.18.5":
-  version "0.18.5"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.18.5.tgz#019eb52870974b3fd596ba68347b6c1e09290589"
+"@polkadot/util-keyring@^0.18.6":
+  version "0.18.6"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.18.6.tgz#983b58ac371a5866adcc0469d8c03a24a7a77f06"
   dependencies:
-    "@polkadot/util" "^0.18.5"
-    "@polkadot/util-crypto" "^0.18.5"
+    "@polkadot/util" "^0.18.6"
+    "@polkadot/util-crypto" "^0.18.6"
     babel-runtime "^6.26.0"
 
 "@polkadot/util-rlp@^0.18.4":
@@ -227,9 +227,9 @@
     deasync "^0.1.12"
     ip-regex "^2.1.0"
 
-"@polkadot/util@^0.18.5":
-  version "0.18.5"
-  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.18.5.tgz#98c04608fceadaaace765eb44253912edc007651"
+"@polkadot/util@^0.18.6":
+  version "0.18.6"
+  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.18.6.tgz#dd3ea07d67d31de02a154dd54665ce9779a73211"
   dependencies:
     babel-runtime "^6.26.0"
     bn.js "^4.11.8"