From eaeb715e56bbb3243268ee5fd863cfd1f1211c39 Mon Sep 17 00:00:00 2001
From: Olaf Tomalka <olaf@tomalka.me>
Date: Wed, 31 Jan 2018 14:24:20 +0100
Subject: Updated contract generation in 0x to new abi-gen CLI

---
 .../contract_templates/partials/call.handlebars    | 15 +++++++
 .../contract_templates/partials/call.mustache      | 15 -------
 .../contract_templates/partials/params.handlebars  |  3 ++
 .../contract_templates/partials/params.mustache    |  3 --
 .../partials/return_type.handlebars                |  6 +++
 .../partials/return_type.mustache                  |  6 ---
 .../contract_templates/partials/tx.handlebars      | 51 ++++++++++++++++++++++
 .../0x.js/contract_templates/partials/tx.mustache  | 51 ----------------------
 .../partials/typed_params.handlebars               |  3 ++
 .../partials/typed_params.mustache                 |  3 --
 10 files changed, 78 insertions(+), 78 deletions(-)
 create mode 100644 packages/0x.js/contract_templates/partials/call.handlebars
 delete mode 100644 packages/0x.js/contract_templates/partials/call.mustache
 create mode 100644 packages/0x.js/contract_templates/partials/params.handlebars
 delete mode 100644 packages/0x.js/contract_templates/partials/params.mustache
 create mode 100644 packages/0x.js/contract_templates/partials/return_type.handlebars
 delete mode 100644 packages/0x.js/contract_templates/partials/return_type.mustache
 create mode 100644 packages/0x.js/contract_templates/partials/tx.handlebars
 delete mode 100644 packages/0x.js/contract_templates/partials/tx.mustache
 create mode 100644 packages/0x.js/contract_templates/partials/typed_params.handlebars
 delete mode 100644 packages/0x.js/contract_templates/partials/typed_params.mustache

(limited to 'packages/0x.js/contract_templates/partials')

diff --git a/packages/0x.js/contract_templates/partials/call.handlebars b/packages/0x.js/contract_templates/partials/call.handlebars
new file mode 100644
index 000000000..ef4bda724
--- /dev/null
+++ b/packages/0x.js/contract_templates/partials/call.handlebars
@@ -0,0 +1,15 @@
+public {{this.name}} = {
+    async callAsync(
+    {{> typed_params inputs=inputs}}
+        defaultBlock?: Web3.BlockParam,
+    ): Promise<{{> return_type outputs=outputs}}> {
+        const self = this as {{contractName}}Contract;
+        const result = await promisify<{{> return_type outputs=outputs}}>(
+            self.web3ContractInstance.{{this.name}}.call,
+            self.web3ContractInstance,
+        )(
+            {{> params inputs=inputs}}
+        );
+        return result;
+    },
+};
diff --git a/packages/0x.js/contract_templates/partials/call.mustache b/packages/0x.js/contract_templates/partials/call.mustache
deleted file mode 100644
index ef4bda724..000000000
--- a/packages/0x.js/contract_templates/partials/call.mustache
+++ /dev/null
@@ -1,15 +0,0 @@
-public {{this.name}} = {
-    async callAsync(
-    {{> typed_params inputs=inputs}}
-        defaultBlock?: Web3.BlockParam,
-    ): Promise<{{> return_type outputs=outputs}}> {
-        const self = this as {{contractName}}Contract;
-        const result = await promisify<{{> return_type outputs=outputs}}>(
-            self.web3ContractInstance.{{this.name}}.call,
-            self.web3ContractInstance,
-        )(
-            {{> params inputs=inputs}}
-        );
-        return result;
-    },
-};
diff --git a/packages/0x.js/contract_templates/partials/params.handlebars b/packages/0x.js/contract_templates/partials/params.handlebars
new file mode 100644
index 000000000..ac5d4ae85
--- /dev/null
+++ b/packages/0x.js/contract_templates/partials/params.handlebars
@@ -0,0 +1,3 @@
+{{#each inputs}}
+{{name}},
+{{/each}}
diff --git a/packages/0x.js/contract_templates/partials/params.mustache b/packages/0x.js/contract_templates/partials/params.mustache
deleted file mode 100644
index ac5d4ae85..000000000
--- a/packages/0x.js/contract_templates/partials/params.mustache
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#each inputs}}
-{{name}},
-{{/each}}
diff --git a/packages/0x.js/contract_templates/partials/return_type.handlebars b/packages/0x.js/contract_templates/partials/return_type.handlebars
new file mode 100644
index 000000000..383961a40
--- /dev/null
+++ b/packages/0x.js/contract_templates/partials/return_type.handlebars
@@ -0,0 +1,6 @@
+{{#singleReturnValue}}
+{{#returnType outputs.0.type}}{{/returnType}}
+{{/singleReturnValue}}
+{{^singleReturnValue}}
+[{{#each outputs}}{{#returnType type}}{{/returnType}}{{#unless @last}}, {{/unless}}{{/each}}]
+{{/singleReturnValue}}
diff --git a/packages/0x.js/contract_templates/partials/return_type.mustache b/packages/0x.js/contract_templates/partials/return_type.mustache
deleted file mode 100644
index 383961a40..000000000
--- a/packages/0x.js/contract_templates/partials/return_type.mustache
+++ /dev/null
@@ -1,6 +0,0 @@
-{{#singleReturnValue}}
-{{#returnType outputs.0.type}}{{/returnType}}
-{{/singleReturnValue}}
-{{^singleReturnValue}}
-[{{#each outputs}}{{#returnType type}}{{/returnType}}{{#unless @last}}, {{/unless}}{{/each}}]
-{{/singleReturnValue}}
diff --git a/packages/0x.js/contract_templates/partials/tx.handlebars b/packages/0x.js/contract_templates/partials/tx.handlebars
new file mode 100644
index 000000000..8a43e5319
--- /dev/null
+++ b/packages/0x.js/contract_templates/partials/tx.handlebars
@@ -0,0 +1,51 @@
+public {{this.name}} = {
+    async sendTransactionAsync(
+    {{> typed_params inputs=inputs}}
+    {{#this.payable}}
+        txData: TxDataPayable = {},
+    {{/this.payable}}
+    {{^this.payable}}
+        txData: TxData = {},
+    {{/this.payable}}
+    ): Promise<string> {
+        const self = this as {{contractName}}Contract;
+        const txDataWithDefaults = await self.applyDefaultsToTxDataAsync(
+            txData,
+            self.{{this.name}}.estimateGasAsync.bind(
+                self,
+                {{> params inputs=inputs}}
+            ),
+        );
+        const txHash = await promisify<string>(
+            self.web3ContractInstance.{{this.name}}, self.web3ContractInstance,
+        )(
+            {{> params inputs=inputs}}
+            txDataWithDefaults,
+        );
+        return txHash;
+    },
+    async estimateGasAsync(
+    {{> typed_params inputs=inputs}}
+        txData: TxData = {},
+    ): Promise<number> {
+        const self = this as {{contractName}}Contract;
+        const txDataWithDefaults = await self.applyDefaultsToTxDataAsync(
+            txData,
+        );
+        const gas = await promisify<number>(
+            self.web3ContractInstance.{{this.name}}.estimateGas, self.web3ContractInstance,
+        )(
+            {{> params inputs=inputs}}
+            txDataWithDefaults,
+        );
+        return gas;
+    },
+    getABIEncodedTransactionData(
+    {{> typed_params inputs=inputs}}
+        txData: TxData = {},
+    ): string {
+        const self = this as {{contractName}}Contract;
+        const abiEncodedTransactionData = self.web3ContractInstance.{{this.name}}.getData();
+        return abiEncodedTransactionData;
+    },
+};
diff --git a/packages/0x.js/contract_templates/partials/tx.mustache b/packages/0x.js/contract_templates/partials/tx.mustache
deleted file mode 100644
index 8a43e5319..000000000
--- a/packages/0x.js/contract_templates/partials/tx.mustache
+++ /dev/null
@@ -1,51 +0,0 @@
-public {{this.name}} = {
-    async sendTransactionAsync(
-    {{> typed_params inputs=inputs}}
-    {{#this.payable}}
-        txData: TxDataPayable = {},
-    {{/this.payable}}
-    {{^this.payable}}
-        txData: TxData = {},
-    {{/this.payable}}
-    ): Promise<string> {
-        const self = this as {{contractName}}Contract;
-        const txDataWithDefaults = await self.applyDefaultsToTxDataAsync(
-            txData,
-            self.{{this.name}}.estimateGasAsync.bind(
-                self,
-                {{> params inputs=inputs}}
-            ),
-        );
-        const txHash = await promisify<string>(
-            self.web3ContractInstance.{{this.name}}, self.web3ContractInstance,
-        )(
-            {{> params inputs=inputs}}
-            txDataWithDefaults,
-        );
-        return txHash;
-    },
-    async estimateGasAsync(
-    {{> typed_params inputs=inputs}}
-        txData: TxData = {},
-    ): Promise<number> {
-        const self = this as {{contractName}}Contract;
-        const txDataWithDefaults = await self.applyDefaultsToTxDataAsync(
-            txData,
-        );
-        const gas = await promisify<number>(
-            self.web3ContractInstance.{{this.name}}.estimateGas, self.web3ContractInstance,
-        )(
-            {{> params inputs=inputs}}
-            txDataWithDefaults,
-        );
-        return gas;
-    },
-    getABIEncodedTransactionData(
-    {{> typed_params inputs=inputs}}
-        txData: TxData = {},
-    ): string {
-        const self = this as {{contractName}}Contract;
-        const abiEncodedTransactionData = self.web3ContractInstance.{{this.name}}.getData();
-        return abiEncodedTransactionData;
-    },
-};
diff --git a/packages/0x.js/contract_templates/partials/typed_params.handlebars b/packages/0x.js/contract_templates/partials/typed_params.handlebars
new file mode 100644
index 000000000..3ea4b2e95
--- /dev/null
+++ b/packages/0x.js/contract_templates/partials/typed_params.handlebars
@@ -0,0 +1,3 @@
+{{#each inputs}}
+    {{name}}: {{#parameterType type}}{{/parameterType}},
+{{/each}}
diff --git a/packages/0x.js/contract_templates/partials/typed_params.mustache b/packages/0x.js/contract_templates/partials/typed_params.mustache
deleted file mode 100644
index 3ea4b2e95..000000000
--- a/packages/0x.js/contract_templates/partials/typed_params.mustache
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#each inputs}}
-    {{name}}: {{#parameterType type}}{{/parameterType}},
-{{/each}}
-- 
cgit