> modified: es6/util/property.js

> modified: es6/zil/index.js > modified: es6/zil/methodObjects.js > modified: lib/util/property.js > modified: lib/zil/index.js > modified: lib/zil/methodObjects.js > modified: package.json
FireStack-Lab · Aug 28, 2018 · a3cab54 · a3cab54
1 parent f95db10
commit a3cab54
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/es6/util/property.js b/es6/util/property.js
@@ -13,7 +13,7 @@ class Property {
 
   propertyBuilder = () => {
     if (this.messanger !== null) {
-      return function get(callback) {
+      return (callback) => {
         if (callback) {
           return this.messanger.sendAsync({ method: this.getter }, callback)
         }

diff --git a/es6/zil/index.js b/es6/zil/index.js
@@ -26,10 +26,16 @@ const mapPropertyToObjects = (main) => {
     const zilProperty = new Property(data)
     const zilName = data.name
     zilProperty.setMessanger(main.messanger)
+    const asyncGetterName = (getName) => {
+      return `get${getName.charAt(0).toUpperCase()}${getName.slice(1)}`
+    }
     const zilObject = {
       get: zilProperty.propertyBuilder(),
       enumerable: true
     }
+    const newZilObject = {}
+    newZilObject[asyncGetterName(zilName)] = main.propertyBuilder()
+    Object.assign(main, newZilObject)
     return Object.defineProperty(main, zilName, zilObject)
   })
 }

diff --git a/es6/zil/methodObjects.js b/es6/zil/methodObjects.js
@@ -237,11 +237,11 @@ export default [
    * getHashrate
    * @params {}
    */
-  {
-    name: 'getHashrate',
-    call: 'GetHashrate',
-    params: {}
-  },
+  // {
+  //   name: 'getHashrate',
+  //   call: 'GetHashrate',
+  //   params: {}
+  // },
   /**
    * isNodeMining
    * @params {}

diff --git a/lib/util/property.js b/lib/util/property.js
@@ -21,11 +21,11 @@ var Property = function Property(options) {
 
   this.propertyBuilder = function () {
     if (_this.messanger !== null) {
-      return function get(callback) {
+      return function (callback) {
         if (callback) {
-          return this.messanger.sendAsync({ method: this.getter }, callback);
+          return _this.messanger.sendAsync({ method: _this.getter }, callback);
         }
-        return this.messanger.send({ method: this.getter });
+        return _this.messanger.send({ method: _this.getter });
       };
     }
   };

diff --git a/lib/zil/index.js b/lib/zil/index.js
@@ -60,10 +60,16 @@ var mapPropertyToObjects = function mapPropertyToObjects(main) {
     var zilProperty = new _property2.default(data);
     var zilName = data.name;
     zilProperty.setMessanger(main.messanger);
+    var asyncGetterName = function asyncGetterName(getName) {
+      return 'get' + getName.charAt(0).toUpperCase() + getName.slice(1);
+    };
     var zilObject = {
       get: zilProperty.propertyBuilder(),
       enumerable: true
     };
+    var newZilObject = {};
+    newZilObject[asyncGetterName(zilName)] = main.propertyBuilder();
+    (0, _assign2.default)(main, newZilObject);
     return (0, _defineProperty2.default)(main, zilName, zilObject);
   });
 };

diff --git a/lib/zil/methodObjects.js b/lib/zil/methodObjects.js
@@ -242,11 +242,11 @@ exports.default = [
  * getHashrate
  * @params {}
  */
-{
-  name: 'getHashrate',
-  call: 'GetHashrate',
-  params: {}
-},
+// {
+//   name: 'getHashrate',
+//   call: 'GetHashrate',
+//   params: {}
+// },
 /**
  * isNodeMining
  * @params {}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webz.js",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Zilliqa Javascript Libraries",
   "main": "lib/index.js",
   "browser": "dist/Webz.browser.js",