async_hooks: rename currentId and triggerId

currentId is renamed to executionAsyncId
triggerId is renamed to triggerAsyncId
AsyncResource.triggerId is renamed to AsyncResource.triggerAsyncId
AsyncHooksGetCurrentId is renamed to AsyncHooksGetExecutionAsyncId
AsyncHooksGetTriggerId is renamed to AsyncHooksGetTriggerAsyncId

PR-URL: https://github.com/nodejs/node/pull/13490
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/test/async-hooks/test-tcpwrap.js b/test/async-hooks/test-tcpwrap.js
index bdb45b47a3..0dce8c7d9f 100644
--- a/test/async-hooks/test-tcpwrap.js
+++ b/test/async-hooks/test-tcpwrap.js
@@ -34,7 +34,7 @@ const server = net
   tcp1 = tcps[0];
   assert.strictEqual(tcp1.type, 'TCPWRAP');
   assert.strictEqual(typeof tcp1.uid, 'number');
-  assert.strictEqual(typeof tcp1.triggerId, 'number');
+  assert.strictEqual(typeof tcp1.triggerAsyncId, 'number');
   checkInvocations(tcp1, { init: 1 }, 'when calling server.listen');
 }
 
@@ -54,7 +54,7 @@ const server = net
   assert.strictEqual(tcps.length, 2);
   assert.strictEqual(tcp2.type, 'TCPWRAP');
   assert.strictEqual(typeof tcp2.uid, 'number');
-  assert.strictEqual(typeof tcp2.triggerId, 'number');
+  assert.strictEqual(typeof tcp2.triggerAsyncId, 'number');
 
   checkInvocations(tcp1, { init: 1 }, 'tcp1 when client is connecting');
   checkInvocations(tcp2, { init: 1 }, 'tcp2 when client is connecting');
@@ -86,7 +86,7 @@ function ontcpConnection(serverConnection) {
   tcpconnect = tcpconnects[0];
   assert.strictEqual(tcpconnect.type, 'TCPCONNECTWRAP');
   assert.strictEqual(typeof tcpconnect.uid, 'number');
-  assert.strictEqual(typeof tcpconnect.triggerId, 'number');
+  assert.strictEqual(typeof tcpconnect.triggerAsyncId, 'number');
   // When client receives connection first ('onconnected'), we 'before' has
   // been invoked at this point already, otherwise it only was 'init'ed
   const expected = serverConnection ? { init: 1 } : { init: 1, before: 1 };
@@ -117,7 +117,7 @@ function onconnection(c) {
   tcp3 = tcps[2];
   assert.strictEqual(tcp3.type, 'TCPWRAP');
   assert.strictEqual(typeof tcp3.uid, 'number');
-  assert.strictEqual(typeof tcp3.triggerId, 'number');
+  assert.strictEqual(typeof tcp3.triggerAsyncId, 'number');
 
   checkInvocations(tcp1, { init: 1, before: 1 },
                    'tcp1 when server receives connection');