assert: resolve TODO and rename function

lib/assert.js

@@ -83,7 +83,7 @@ function lazyLoadComparison() {
 // AssertionError's when particular conditions are not met. The
 // assert module must conform to the following interface.
 
-const assert = module.exports = ok;
+module.exports = assert;
 
 const NO_EXCEPTION_SENTINEL = {};
 
@@ -186,8 +186,8 @@ assert.AssertionError = AssertionError;
  * @param {...any} args
  * @returns {void}
  */
-function ok(...args) {
-  innerOk(ok, args.length, ...args);
+function assert(...args) {
+  innerOk(assert, args.length, ...args);
 }
 
 /**
@@ -890,10 +890,8 @@ function strict(...args) {
   innerOk(strict, args.length, ...args);
 }
 
-// TODO(aduh95): take `ok` from `Assert.prototype` instead of a self-ref in a next major.
-assert.ok = assert;
 ArrayPrototypeForEach([
-  'fail', 'equal', 'notEqual', 'deepEqual', 'notDeepEqual',
+  'ok', 'fail', 'equal', 'notEqual', 'deepEqual', 'notDeepEqual',
   'deepStrictEqual', 'notDeepStrictEqual', 'strictEqual',
   'notStrictEqual', 'partialDeepStrictEqual', 'match', 'doesNotMatch',
   'throws', 'rejects', 'doesNotThrow', 'doesNotReject', 'ifError',

test/parallel/test-fs-promises.js

@@ -58,7 +58,7 @@ assert.strictEqual(
       code: 'ENOENT',
       name: 'Error',
       message: /^ENOENT: no such file or directory, access/,
-      stack: /at async ok\.rejects/
+      stack: /at async assert\.rejects/
     }
   ).then(common.mustCall());