From 4514ea8123479b0a71449f3f3c93bdc4c2837f75 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Wed, 24 Feb 2016 18:22:18 +0100
Subject: [PATCH] Minor fixes related to promise-toolbox.

---
 src/collection/redis.js | 10 ++--------
 src/utils.js            |  2 +-
 src/xo-mixins/store.js  |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/collection/redis.js b/src/collection/redis.js
index 2ddb80205..acf4d716e 100644
--- a/src/collection/redis.js
+++ b/src/collection/redis.js
@@ -1,9 +1,8 @@
-import assign from 'lodash.assign'
 import Collection, {ModelAlreadyExists} from '../collection'
 import difference from 'lodash.difference'
 import filter from 'lodash.filter'
 import getKey from 'lodash.keys'
-import {createClient as createRedisClient, RedisClient, Multi} from 'redis'
+import {createClient as createRedisClient} from 'redis'
 
 import {
   forEach,
@@ -14,11 +13,6 @@ import {
 
 // ===================================================================
 
-assign(RedisClient.prototype, RedisClient.prototype::promisifyAll())
-assign(Multi.prototype, Multi.prototype::promisifyAll())
-
-// ===================================================================
-
 // ///////////////////////////////////////////////////////////////////
 // Data model:
 // - prefix +'_id': value of the last generated identifier;
@@ -47,7 +41,7 @@ export default class Redis extends Collection {
 
     this.indexes = indexes
     this.prefix = prefix
-    this.redis = connection || createRedisClient(uri)
+    this.redis = promisifyAll.call(connection || createRedisClient(uri))
   }
 
   _extract (ids) {
diff --git a/src/utils.js b/src/utils.js
index dda2b36f3..c40cd4888 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -308,7 +308,7 @@ export function pSettle (promises) {
 
 export {
   all as pAll,
-  FromCallback as pFromCallback,
+  fromCallback as pFromCallback,
   isPromise,
   lastly as pFinally,
   promisify,
diff --git a/src/xo-mixins/store.js b/src/xo-mixins/store.js
index 12bd7144c..aa60b7053 100644
--- a/src/xo-mixins/store.js
+++ b/src/xo-mixins/store.js
@@ -54,7 +54,7 @@ const levelPromise = db => {
       dbP[name] = db::value
     } else {
       dbP[`${name}Sync`] = db::value
-      dbP[name] = promisify(value, { context: db })
+      dbP[name] = value::promisify(db)
     }
   })