From f55732af51e9f92f15b61e7ea8310ce99e578be4 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Mon, 13 May 2019 21:53:46 +1200
Subject: [PATCH] Start supporting double map  (#843)

* double map fix

* update metadata to prevent error using double map
---
 packages/types/src/Metadata/v3/Storage.ts | 27 ++++++++++----------
 packages/types/src/Metadata/v4/Storage.ts | 30 +++++++++++------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/packages/types/src/Metadata/v3/Storage.ts b/packages/types/src/Metadata/v3/Storage.ts
index 6a40ed1475..ad8f52807b 100644
--- a/packages/types/src/Metadata/v3/Storage.ts
+++ b/packages/types/src/Metadata/v3/Storage.ts
@@ -11,6 +11,7 @@ import Struct from '../../codec/Struct';
 import Vector from '../../codec/Vector';
 import Bytes from '../../primitive/Bytes';
 import Text from '../../primitive/Text';
+import Type from '../../primitive/Type';
 import {
   MapType,
   PlainType,
@@ -27,25 +28,25 @@ export {
 export class DoubleMapType extends Struct {
   constructor (value?: any) {
     super({
-      key1: Text,
-      key2: Text,
-      value: Text,
+      key1: Type,
+      key2: Type,
+      value: Type,
       key2Hasher: Text
     }, value);
   }
 
   /**
-   * @description The mapped key as [[Text]]
+   * @description The mapped key as [[Type]]
    */
-  get key1 (): Text {
-    return this.get('key1') as Text;
+  get key1 (): Type {
+    return this.get('key1') as Type;
   }
 
   /**
-   * @description The mapped key as [[Text]]
+   * @description The mapped key as [[Type]]
    */
-  get key2 (): Text {
-    return this.get('key2') as Text;
+  get key2 (): Type {
+    return this.get('key2') as Type;
   }
 
   /**
@@ -56,10 +57,10 @@ export class DoubleMapType extends Struct {
   }
 
   /**
-   * @description The mapped key as [[Text]]
+   * @description The mapped key as [[Type]]
    */
-  get value (): Text {
-    return this.get('value') as Text;
+  get value (): Type {
+    return this.get('value') as Type;
   }
 }
 
@@ -125,7 +126,7 @@ export class StorageFunctionType extends EnumType<PlainType | MapType | DoubleMa
    */
   toString (): string {
     if (this.isDoubleMap) {
-      return this.asDoubleMap.toString();
+      return this.asDoubleMap.value.toString();
     }
 
     if (this.isMap) {
diff --git a/packages/types/src/Metadata/v4/Storage.ts b/packages/types/src/Metadata/v4/Storage.ts
index a24149e293..18159c0f95 100644
--- a/packages/types/src/Metadata/v4/Storage.ts
+++ b/packages/types/src/Metadata/v4/Storage.ts
@@ -114,32 +114,32 @@ export class DoubleMapType extends Struct {
   constructor (value?: any) {
     super({
       hasher: StorageHasher,
-      key1: Text,
-      key2: Text,
-      value: Text,
+      key1: Type,
+      key2: Type,
+      value: Type,
       key2Hasher: Text
     }, value);
   }
 
   /**
-   * @description The hashing algorithm used to hash keys, as [[Text]]
+   * @description The hashing algorithm used to hash keys, as [[StorageHasher]]
    */
-  get hasher (): Text {
-    return this.get('hasher') as Text;
+  get hasher (): StorageHasher {
+    return this.get('hasher') as StorageHasher;
   }
 
   /**
-   * @description The mapped key as [[Text]]
+   * @description The mapped key as [[Type]]
    */
-  get key1 (): Text {
-    return this.get('key1') as Text;
+  get key1 (): Type {
+    return this.get('key1') as Type;
   }
 
   /**
-   * @description The mapped key as [[Text]]
+   * @description The mapped key as [[Type]]
    */
-  get key2 (): Text {
-    return this.get('key2') as Text;
+  get key2 (): Type {
+    return this.get('key2') as Type;
   }
 
   /**
@@ -150,10 +150,10 @@ export class DoubleMapType extends Struct {
   }
 
   /**
-   * @description The mapped key as [[Text]]
+   * @description The mapped key as [[Type]]
    */
-  get value (): Text {
-    return this.get('value') as Text;
+  get value (): Type {
+    return this.get('value') as Type;
   }
 }