refactor: move eccLib to PaymentOptions

Author: motorina0

src/payments/index.d.ts

@@ -34,6 +34,7 @@ export declare type PaymentFunction = () => Payment;
 export interface PaymentOpts {
     validate?: boolean;
     allowIncomplete?: boolean;
+    eccLib?: TinySecp256k1Interface;
 }
 export declare type StackElement = Buffer | number;
 export declare type Stack = StackElement[];

src/payments/p2tr.d.ts

@@ -1,3 +1,2 @@
-import { TinySecp256k1Interface } from '../types';
 import { Payment, PaymentOpts } from './index';
-export declare function p2tr(a: Payment, opts?: PaymentOpts, eccLib?: TinySecp256k1Interface): Payment;
+export declare function p2tr(a: Payment, opts?: PaymentOpts): Payment;

src/payments/p2tr.js

@@ -12,7 +12,7 @@ const testecc_1 = require('./testecc');
 const OPS = bscript.OPS;
 const TAPROOT_VERSION = 0x01;
 const ANNEX_PREFIX = 0x50;
-function p2tr(a, opts, eccLib) {
+function p2tr(a, opts) {
   if (
     !a.address &&
     !a.output &&
@@ -24,9 +24,9 @@ function p2tr(a, opts, eccLib) {
     throw new TypeError('Not enough data');
   opts = Object.assign({ validate: true }, opts || {});
   const _ecc = lazy.value(() => {
-    if (!eccLib) throw new Error('ECC Library is missing for p2tr.');
-    (0, testecc_1.testEcc)(eccLib);
-    return eccLib;
+    if (!opts.eccLib) throw new Error('ECC Library is missing for p2tr.');
+    (0, testecc_1.testEcc)(opts.eccLib);
+    return opts.eccLib;
   });
   (0, types_1.typeforce)(
     {

test/payments.spec.ts

@@ -21,9 +21,10 @@ import { TinySecp256k1Interface } from '../src/types';
       const fixtures = require('./fixtures/' + p);
 
       fixtures.valid.forEach((f: any) => {
+        const options = Object.assign({ eccLib }, f.options || {});
         it(f.description + ' as expected', () => {
           const args = u.preform(f.arguments);
-          const actual = fn(args, f.options, eccLib);
+          const actual = fn(args, options, eccLib);
 
           u.equate(actual, f.expected, f.arguments);
         });
@@ -32,7 +33,7 @@ import { TinySecp256k1Interface } from '../src/types';
           const args = u.preform(f.arguments);
           const actual = fn(
             args,
-            Object.assign({}, f.options, {
+            Object.assign({}, options, {
               validate: false,
             }),
             eccLib,
@@ -43,6 +44,7 @@ import { TinySecp256k1Interface } from '../src/types';
       });
 
       fixtures.invalid.forEach((f: any) => {
+        const options = Object.assign({ eccLib }, f.options || {});
         it(
           'throws ' +
             f.exception +
@@ -51,7 +53,7 @@ import { TinySecp256k1Interface } from '../src/types';
             const args = u.preform(f.arguments);
 
             assert.throws(() => {
-              fn(args, f.options, eccLib);
+              fn(args, options, eccLib);
             }, new RegExp(f.exception));
           },
         );

ts_src/payments/index.ts

@@ -41,6 +41,7 @@ export type PaymentFunction = () => Payment;
 export interface PaymentOpts {
   validate?: boolean;
   allowIncomplete?: boolean;
+  eccLib?: TinySecp256k1Interface;
 }
 
 export type StackElement = Buffer | number;

ts_src/payments/p2tr.ts

@@ -18,11 +18,7 @@ const OPS = bscript.OPS;
 const TAPROOT_VERSION = 0x01;
 const ANNEX_PREFIX = 0x50;
 
-export function p2tr(
-  a: Payment,
-  opts?: PaymentOpts,
-  eccLib?: TinySecp256k1Interface,
-): Payment {
+export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
   if (
     !a.address &&
     !a.output &&
@@ -36,10 +32,10 @@ export function p2tr(
   opts = Object.assign({ validate: true }, opts || {});
 
   const _ecc = lazy.value(() => {
-    if (!eccLib) throw new Error('ECC Library is missing for p2tr.');
+    if (!opts!.eccLib) throw new Error('ECC Library is missing for p2tr.');
 
-    testEcc(eccLib);
-    return eccLib;
+    testEcc(opts!.eccLib);
+    return opts!.eccLib;
   });
 
   typef(