Merge pull request #179 from steemit/remove-async-await

Remove async await
steemit · Jun 22, 2017 · e46ec11 · e46ec11
2 parents 23fa3b7 + 8b43a6b
commit e46ec11
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 67 deletions.
diff --git a/.babelrc b/.babelrc
@@ -2,9 +2,5 @@
   "presets": [
     "es2015",
     "es2017"
-  ],
-  "plugins": [
-    "transform-async-to-generator",
-    "transform-regenerator"
   ]
 }
diff --git a/index.js b/index.js
@@ -1,5 +1,3 @@
-require("babel-polyfill");
-
 const api = require("./lib/api");
 const auth = require("./lib/auth");
 const broadcast = require("./lib/broadcast");

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steem",
-  "version": "0.5.16",
+  "version": "0.5.17",
   "description": "Steem.js the JavaScript API for Steem blockchain",
   "main": "index.js",
   "scripts": {
@@ -53,9 +53,7 @@
     "babel-cli": "^6.16.0",
     "babel-eslint": "^7.1.1",
     "babel-loader": "^6.2.5",
-    "babel-plugin-transform-async-to-generator": "^6.24.1",
-    "babel-plugin-transform-regenerator": "^6.24.1",
-    "babel-polyfill": "^6.16.0",
+    "babel-polyfill": "^6.23.0",
     "babel-preset-es2015": "^6.16.0",
     "babel-preset-es2017": "^6.16.0",
     "babel-register": "^6.14.0",
@@ -77,4 +75,4 @@
     "Nilesh Suthar (https://github.com/nil1511)",
     "Pedro Tacla Yamada (https://github.com/yamadapc)"
   ]
-}
+}
diff --git a/src/broadcast/helpers.js b/src/broadcast/helpers.js
@@ -3,77 +3,79 @@ import api from "../api";
 const defaultWeight = 1;
 
 exports = module.exports = steemBroadcast => {
-  steemBroadcast.addAccountAuth = async (
+  steemBroadcast.addAccountAuth = (
     activeWif,
     username,
     authorizedUsername,
     role = "posting",
     cb
   ) => {
-    const [userAccount] = await api.getAccountsAsync([username]);
+    api.getAccountsAsync([username]).then(([userAccount]) => {
+      const updatedAuthority = userAccount[role];
+      const authorizedAccounts = updatedAuthority.account_auths.map(
+        auth => auth[0]
+      );
+      const hasAuthority =
+        authorizedAccounts.indexOf(authorizedUsername) !== -1;
 
-    const updatedAuthority = userAccount[role];
-    const authorizedAccounts = updatedAuthority.account_auths.map(
-      auth => auth[0]
-    );
-    const hasAuthority = authorizedAccounts.indexOf(authorizedUsername) !== -1;
-
-    if (hasAuthority) {
-      // user does already exist in authorized list
-      return cb(null, null);
-    }
-    updatedAuthority.account_auths.push([authorizedUsername, defaultWeight]);
-    const owner = role === "owner" ? updatedAuthority : undefined;
-    const active = role === "active" ? updatedAuthority : undefined;
-    const posting = role === "posting" ? updatedAuthority : undefined;
-    /** Add authority on user account */
-    steemBroadcast.accountUpdate(
-      activeWif,
-      userAccount.name,
-      owner,
-      active,
-      posting,
-      userAccount.memo_key,
-      userAccount.json_metadata,
-      cb
-    );
+      if (hasAuthority) {
+        // user does already exist in authorized list
+        return cb(null, null);
+      }
+      updatedAuthority.account_auths.push([authorizedUsername, defaultWeight]);
+      const owner = role === "owner" ? updatedAuthority : undefined;
+      const active = role === "active" ? updatedAuthority : undefined;
+      const posting = role === "posting" ? updatedAuthority : undefined;
+      /** Add authority on user account */
+      steemBroadcast.accountUpdate(
+        activeWif,
+        userAccount.name,
+        owner,
+        active,
+        posting,
+        userAccount.memo_key,
+        userAccount.json_metadata,
+        cb
+      );
+    });
   };
 
-  steemBroadcast.removeAccountAuth = async (
+  steemBroadcast.removeAccountAuth = (
     activeWif,
     username,
     authorizedUsername,
     role = "posting",
     cb
   ) => {
-    const [userAccount] = await api.getAccountsAsync([username]);
-    const updatedAuthority = userAccount[role];
-    const totalAuthorizedUser = updatedAuthority.account_auths.length;
-    for (let i = 0; i < totalAuthorizedUser; i++) {
-      const user = updatedAuthority.account_auths[i];
-      if (user[0] === authorizedUsername) {
-        updatedAuthority.account_auths.splice(i, 1);
-        break;
+    api.getAccountsAsync([username]).then(([userAccount]) => {
+      const updatedAuthority = userAccount[role];
+      const totalAuthorizedUser = updatedAuthority.account_auths.length;
+      for (let i = 0; i < totalAuthorizedUser; i++) {
+        const user = updatedAuthority.account_auths[i];
+        if (user[0] === authorizedUsername) {
+          updatedAuthority.account_auths.splice(i, 1);
+          break;
+        }
+      }
+      // user does not exist in authorized list
+      if (totalAuthorizedUser === updatedAuthority.account_auths.length) {
+        return cb(null, null);
       }
-    }
-    // user does not exist in authorized list
-    if (totalAuthorizedUser === updatedAuthority.account_auths.length) {
-      return cb(null, null);
-    }
 
-    const owner = role === "owner" ? updatedAuthority : undefined;
-    const active = role === "active" ? updatedAuthority : undefined;
-    const posting = role === "posting" ? updatedAuthority : undefined;
+      const owner = role === "owner" ? updatedAuthority : undefined;
+      const active = role === "active" ? updatedAuthority : undefined;
+      const posting = role === "posting" ? updatedAuthority : undefined;
 
-    steemBroadcast.accountUpdate(
-      activeWif,
-      userAccount.name,
-      owner,
-      active,
-      posting,
-      userAccount.memo_key,
-      userAccount.json_metadata,
-      cb
-    );
+      steemBroadcast.accountUpdate(
+        activeWif,
+        userAccount.name,
+        owner,
+        active,
+        posting,
+        userAccount.memo_key,
+        userAccount.json_metadata,
+        cb
+      );
+    });
   };
 };
diff --git a/src/browser.js b/src/browser.js
@@ -1,5 +1,3 @@
-require("babel-polyfill");
-
 const api = require("./api");
 const auth = require("./auth");
 const broadcast = require("./broadcast");