Revert "liar -> lie and add it to parallel"

This reverts commit c098175.
petkaantonov · May 5, 2014 · 6ae5c25 · 6ae5c25
1 parent c098175
commit 6ae5c25
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 43 deletions.
diff --git a/...tial-errors/promises-calvinmetcalf-lie.js → ...ial-errors/promises-calvinmetcalf-liar.js b/...tial-errors/promises-calvinmetcalf-lie.js → ...ial-errors/promises-calvinmetcalf-liar.js
@@ -1,6 +1,6 @@
-global.useLie = true;
+global.useLiar = true;
 
-var promise = require("lie");
+var promise = require("liar");
 
 require('../lib/fakesP');
 

diff --git a/...-sequential/promises-calvinmetcalf-lie.js → ...sequential/promises-calvinmetcalf-liar.js b/...-sequential/promises-calvinmetcalf-lie.js → ...sequential/promises-calvinmetcalf-liar.js
@@ -1,6 +1,6 @@
-global.useLie = true;
+global.useLiar = true;
 
-var promise = require("lie");
+var promise = require("liar");
 
 require('../lib/fakesP');
 

diff --git a/benchmark/lib/fakesP.js b/benchmark/lib/fakesP.js
@@ -25,21 +25,8 @@ else if (global.useKew) {
         }
     }
 }
-else if( global.useLie) {
-    var Promise = require('lie');
-    var slicer = [].slice;
-    var lifter = function lifter(nodefn) {
-        return function() {
-            var p = new Promise(function (resolve, reject){
-                arguments[arguments.length++] = function(err, res) {
-                    if (err) reject(err);
-                    else resolve(res)
-                };
-                nodefn.apply(this, arguments);
-            });
-            return p;
-        }
-    }
+else if( global.useLiar) {
+    var lifter = require("liar").denodify;
 }
 else if( global.useRSVP ) {
     var lifter = require("rsvp").denodeify;

diff --git a/benchmark/madeup-parallel/promises-calvinmetcalf-lie.js b/benchmark/madeup-parallel/promises-calvinmetcalf-lie.js
diff --git a/benchmark/package.json b/benchmark/package.json
@@ -7,14 +7,14 @@
     "async": "~0.7.0",
     "deferred": "~0.7.0",
     "kew": "~0.4.0",
+    "liar": "~0.6.0",
     "optimist": "~0.6.0",
     "q": "~1.0.0",
     "rsvp": "~3.0.0",
     "text-table": "~0.2.0",
     "when": "~3.1.0",
     "vow": "~0.4.1",
-    "davy": "~0.2.0",
-    "lie": "^2.7.2"
+    "davy": "~0.2.0"
   },
   "devDependencies": {},
   "scripts": {