Merge pull request #15 from bitcoinjs/refactor

refactor: forbid unnecessary callback wrapper for consistent code style

Author: junderw

src/lib/combiner/index.js

@@ -11,10 +11,8 @@ function combine(psbts) {
     throw new Error('Combine: Self missing transaction');
   }
   const selfGlobalSet = getKeySet(selfKeyVals.globalKeyVals);
-  const selfInputSets = selfKeyVals.inputKeyVals.map(input => getKeySet(input));
-  const selfOutputSets = selfKeyVals.outputKeyVals.map(output =>
-    getKeySet(output),
-  );
+  const selfInputSets = selfKeyVals.inputKeyVals.map(getKeySet);
+  const selfOutputSets = selfKeyVals.outputKeyVals.map(getKeySet);
   for (const other of others) {
     const otherTx = getTx(other);
     if (
@@ -34,9 +32,7 @@ function combine(psbts) {
         otherKeyVals.globalKeyVals,
       ),
     );
-    const otherInputSets = otherKeyVals.inputKeyVals.map(input =>
-      getKeySet(input),
-    );
+    const otherInputSets = otherKeyVals.inputKeyVals.map(getKeySet);
     otherInputSets.forEach((inputSet, idx) =>
       inputSet.forEach(
         keyPusher(
@@ -46,9 +42,7 @@ function combine(psbts) {
         ),
       ),
     );
-    const otherOutputSets = otherKeyVals.outputKeyVals.map(output =>
-      getKeySet(output),
-    );
+    const otherOutputSets = otherKeyVals.outputKeyVals.map(getKeySet);
     otherOutputSets.forEach((outputSet, idx) =>
       outputSet.forEach(
         keyPusher(

src/lib/converter/tools.js

@@ -16,7 +16,7 @@ function reverseBuffer(buffer) {
 }
 exports.reverseBuffer = reverseBuffer;
 function keyValsToBuffer(keyVals) {
-  const buffers = keyVals.map(keyVal => keyValToBuffer(keyVal));
+  const buffers = keyVals.map(keyValToBuffer);
   buffers.push(Buffer.from([0]));
   return Buffer.concat(buffers);
 }

src/lib/utils.js

@@ -83,7 +83,7 @@ function updateMaker(typeName) {
           ) {
             throw new Error(`Key type ${name} must be an array`);
           }
-          if (!data.every(v => check(v))) {
+          if (!data.every(check)) {
             throwForUpdateMaker(typeName, name, expected, data);
           }
           // @ts-ignore

ts_src/lib/combiner/index.ts

@@ -12,10 +12,8 @@ export function combine(psbts: PsbtAttributes[]): PsbtAttributes {
     throw new Error('Combine: Self missing transaction');
   }
   const selfGlobalSet = getKeySet(selfKeyVals.globalKeyVals);
-  const selfInputSets = selfKeyVals.inputKeyVals.map(input => getKeySet(input));
-  const selfOutputSets = selfKeyVals.outputKeyVals.map(output =>
-    getKeySet(output),
-  );
+  const selfInputSets = selfKeyVals.inputKeyVals.map(getKeySet);
+  const selfOutputSets = selfKeyVals.outputKeyVals.map(getKeySet);
 
   for (const other of others) {
     const otherTx = getTx(other);
@@ -38,9 +36,7 @@ export function combine(psbts: PsbtAttributes[]): PsbtAttributes {
       ),
     );
 
-    const otherInputSets = otherKeyVals.inputKeyVals.map(input =>
-      getKeySet(input),
-    );
+    const otherInputSets = otherKeyVals.inputKeyVals.map(getKeySet);
     otherInputSets.forEach((inputSet, idx) =>
       inputSet.forEach(
         keyPusher(
@@ -51,9 +47,7 @@ export function combine(psbts: PsbtAttributes[]): PsbtAttributes {
       ),
     );
 
-    const otherOutputSets = otherKeyVals.outputKeyVals.map(output =>
-      getKeySet(output),
-    );
+    const otherOutputSets = otherKeyVals.outputKeyVals.map(getKeySet);
     otherOutputSets.forEach((outputSet, idx) =>
       outputSet.forEach(
         keyPusher(

ts_src/lib/converter/tools.ts

@@ -17,7 +17,7 @@ export function reverseBuffer(buffer: Buffer): Buffer {
 }
 
 export function keyValsToBuffer(keyVals: KeyValue[]): Buffer {
-  const buffers = keyVals.map(keyVal => keyValToBuffer(keyVal));
+  const buffers = keyVals.map(keyValToBuffer);
   buffers.push(Buffer.from([0]));
   return Buffer.concat(buffers);
 }

ts_src/lib/utils.ts

@@ -112,7 +112,7 @@ function updateMaker<T, Y>(
           ) {
             throw new Error(`Key type ${name} must be an array`);
           }
-          if (!data.every(v => check(v))) {
+          if (!data.every(check)) {
             throwForUpdateMaker(typeName, name, expected, data);
           }
           // @ts-ignore

tslint.json

@@ -19,6 +19,7 @@
     "no-implicit-dependencies": [true, "dev"],
     "no-return-await": true,
     "no-var-requires": false,
+    "no-unnecessary-callback-wrapper": true,
     "no-unused-expression": false,
     "object-literal-sort-keys": false,
     "quotemark": [true, "single", "avoid-escape"],