minor cleanup

jedisct1 · Sep 29, 2017 · 74a4741 · 74a4741
1 parent 4b5746d
commit 74a4741
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/libsodium b/libsodium
diff --git a/wrapper/libsodium-post.js b/wrapper/libsodium-post.js
@@ -1,5 +1,5 @@
     ENVIRONMENT_IS_NODE && !process.removeAllListeners("uncaughtException");
-    return ModulePromise;
+    return Module;
 }
 
 if (typeof define === 'function' && define.amd) {

diff --git a/wrapper/wrap-template.js b/wrapper/wrap-template.js
@@ -1,22 +1,18 @@
 (function(root) {
 
-function expose_wrappers(exports, libsodiumPromise) {
+function expose_wrappers(exports, libsodiumModule) {
     "use strict";
 
     var output_format = "uint8array";
 
     var libsodium;
-
-    libsodiumPromise = libsodiumPromise.then(function (libsodiumModule) {
+    var ready = libsodiumModule.ready.then(function () {
         libsodium = libsodiumModule;
         if (libsodium._sodium_init() !== 0) {
             throw new Error("libsodium was not correctly initialized.");
         }
-        return libsodium;
     });
 
-    var ready = libsodiumPromise.then(function () {});
-
     // List of functions and constants defined in the wrapped libsodium
     function symbols() {
         return Object.keys(exports).sort();
@@ -469,7 +465,7 @@ function expose_wrappers(exports, libsodiumPromise) {
     exports.from_string = from_string;
     exports.increment = increment;
     exports.is_zero = is_zero;
-    exports.libsodium = libsodiumPromise;
+    exports.libsodium = libsodiumModule;
     exports.memcmp = memcmp;
     exports.memzero = memzero;
     exports.output_formats = output_formats;