From e10eebffa51c4d47edc455f9eb2fa40b91bdff56 Mon Sep 17 00:00:00 2001
From: Andreas Madsen <amwebdk@gmail.com>
Date: Sat, 9 Jan 2016 12:27:53 +0100
Subject: [PATCH] async_wrap: make uid the first argument in init

All other hooks have uid as the first argument, this makes it concistent
for all hooks.

Ref: https://github.com/nodejs/node/pull/7048
PR-URL: #4600
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 src/async-wrap-inl.h                                       | 2 +-
 test/parallel/test-async-wrap-check-providers.js           | 4 ++--
 test/parallel/test-async-wrap-disabled-propagate-parent.js | 2 +-
 test/parallel/test-async-wrap-propagate-parent.js          | 2 +-
 test/parallel/test-async-wrap-uid.js                       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h
index f2d2c3ecf1c7b4..d1197edc05f20c 100644
--- a/src/async-wrap-inl.h
+++ b/src/async-wrap-inl.h
@@ -40,8 +40,8 @@ inline AsyncWrap::AsyncWrap(Environment* env,
   v8::HandleScope scope(env->isolate());
 
   v8::Local<v8::Value> argv[] = {
-    v8::Int32::New(env->isolate(), provider),
     v8::Integer::New(env->isolate(), get_uid()),
+    v8::Int32::New(env->isolate(), provider),
     Null(env->isolate())
   };
 
diff --git a/test/parallel/test-async-wrap-check-providers.js b/test/parallel/test-async-wrap-check-providers.js
index 907b9fa3159926..c08c7a43d445e0 100644
--- a/test/parallel/test-async-wrap-check-providers.js
+++ b/test/parallel/test-async-wrap-check-providers.js
@@ -29,8 +29,8 @@ if (common.isAix) {
   }
 }
 
-function init(id) {
-  keyList = keyList.filter((e) => e != pkeys[id]);
+function init(id, provider) {
+  keyList = keyList.filter((e) => e != pkeys[provider]);
 }
 
 function noop() { }
diff --git a/test/parallel/test-async-wrap-disabled-propagate-parent.js b/test/parallel/test-async-wrap-disabled-propagate-parent.js
index 55d2e59efb9ee7..f7badaffdffcb7 100644
--- a/test/parallel/test-async-wrap-disabled-propagate-parent.js
+++ b/test/parallel/test-async-wrap-disabled-propagate-parent.js
@@ -9,7 +9,7 @@ const providers = Object.keys(async_wrap.Providers);
 let cntr = 0;
 let client;
 
-function init(type, id, parent) {
+function init(id, type, parent) {
   if (parent) {
     cntr++;
     // Cannot assert in init callback or will abort.
diff --git a/test/parallel/test-async-wrap-propagate-parent.js b/test/parallel/test-async-wrap-propagate-parent.js
index 6001539c624678..31aa814100069b 100644
--- a/test/parallel/test-async-wrap-propagate-parent.js
+++ b/test/parallel/test-async-wrap-propagate-parent.js
@@ -8,7 +8,7 @@ const async_wrap = process.binding('async_wrap');
 let cntr = 0;
 let client;
 
-function init(type, id, parent) {
+function init(id, type, parent) {
   if (parent) {
     cntr++;
     // Cannot assert in init callback or will abort.
diff --git a/test/parallel/test-async-wrap-uid.js b/test/parallel/test-async-wrap-uid.js
index ad2dd5027cfa1d..4e664f1bd46ebb 100644
--- a/test/parallel/test-async-wrap-uid.js
+++ b/test/parallel/test-async-wrap-uid.js
@@ -9,7 +9,7 @@ const storage = new Map();
 async_wrap.setupHooks(init, pre, post, destroy);
 async_wrap.enable();
 
-function init(provider, uid) {
+function init(uid) {
   storage.set(uid, {
     init: true,
     pre: false,