Change: linted messaging package --wip-- [skip ci]

packages/messaging/__tests__/chain/ChainManager.spec.ts

@@ -1,4 +1,3 @@
-// tslint:disable: no-unused-expression
 import { expect } from 'chai';
 import sinon from 'sinon';
 
@@ -9,7 +8,6 @@ import {
   CloseType,
   DlcTransactionsV0,
 } from '../../lib/messages/DlcTransactions';
-import { DlcTransactionsV0Pre163 } from '../../lib/messages/pre-163/DlcTransactions';
 import { createFakeLogger } from '../_test-utils';
 
 const fundBlock = {

packages/messaging/__tests__/messages/ContractDescriptor.spec.ts

@@ -5,7 +5,7 @@ import {
   ContractDescriptorType,
   EnumeratedContractDescriptor,
 } from '../../lib/messages/ContractDescriptor';
-import { ContractDescriptorV0Pre163 } from "../../lib/messages/pre-163/ContractDescriptor";
+import { ContractDescriptorV0Pre163 } from '../../lib/messages/pre-163/ContractDescriptor';
 
 describe('EnumeratedContractDescriptor', () => {
   const outcomeOne = '1';

packages/messaging/__tests__/messages/DigitDecompositionEventDescriptor.spec.ts

@@ -46,7 +46,9 @@ describe('DigitDecompositionEventDescriptorV0Pre167', () => {
         , "hex"
       ); // prettier-ignore
 
-      const instance = DigitDecompositionEventDescriptorV0Pre167.deserialize(buf);
+      const instance = DigitDecompositionEventDescriptorV0Pre167.deserialize(
+        buf,
+      );
 
       expect(Number(instance.length)).to.equal(17);
       expect(instance.base).to.equal(2); // (Switch to Number(instance.base) with oracle_announcement_v1)

packages/messaging/__tests__/messages/DlcAccept.spec.ts

@@ -5,12 +5,15 @@ import { expect } from 'chai';
 import { CetAdaptorSignatures } from '../../lib/messages/CetAdaptorSignatures';
 import { DlcAccept, DlcAcceptV0 } from '../../lib/messages/DlcAccept';
 import { FundingInput } from '../../lib/messages/FundingInput';
+import { SingleNegotiationFields } from '../../lib/messages/NegotiationFields';
 import { CetAdaptorSignaturesV0Pre163 } from '../../lib/messages/pre-163/CetAdaptorSignatures';
 import { DlcAcceptV0Pre163 } from '../../lib/messages/pre-163/DlcAccept';
 import { FundingInputV0Pre163 } from '../../lib/messages/pre-163/FundingInput';
-import { NegotiationFieldsPre163, NegotiationFieldsV1Pre163 } from "../../lib/messages/pre-163/NegotiationFields";
+import {
+  NegotiationFieldsPre163,
+  NegotiationFieldsV1Pre163,
+} from '../../lib/messages/pre-163/NegotiationFields';
 import { MessageType } from '../../lib/MessageType';
-import { SingleNegotiationFields } from '../../lib/messages/NegotiationFields';
 
 describe('DlcAccept', () => {
   const bitcoinNetwork = BitcoinNetworks.bitcoin_regtest;

packages/messaging/__tests__/messages/DlcClose.spec.ts

@@ -167,9 +167,7 @@ describe('DlcClose', () => {
         expect(pre163.acceptPayoutSatoshis).to.equal(
           instance.acceptPayoutSatoshis,
         );
-        expect(pre163.fundInputSerialId).to.equal(
-          instance.fundInputSerialId,
-        );
+        expect(pre163.fundInputSerialId).to.equal(instance.fundInputSerialId);
         expect(pre163.fundingInputs.length).to.equal(
           instance.fundingInputs.length,
         );
@@ -259,9 +257,7 @@ describe('DlcClose', () => {
         expect(post163.acceptPayoutSatoshis).to.equal(
           pre163.acceptPayoutSatoshis,
         );
-        expect(post163.fundInputSerialId).to.equal(
-          pre163.fundInputSerialId,
-        );
+        expect(post163.fundInputSerialId).to.equal(pre163.fundInputSerialId);
         expect(post163.fundingInputs.length).to.equal(
           pre163.fundingInputs.length,
         );

packages/messaging/__tests__/messages/DlcOffer.spec.ts

@@ -1,7 +1,7 @@
 import { BitcoinNetworks } from 'bitcoin-networks';
 import { expect } from 'chai';
 
-import { EnumeratedContractDescriptor, SingleOracleInfo } from '../../lib';
+import { EnumeratedContractDescriptor } from '../../lib/messages/ContractDescriptor';
 import {
   ContractInfo,
   ISingleContractInfoJSON,
@@ -13,6 +13,7 @@ import {
   LOCKTIME_THRESHOLD,
 } from '../../lib/messages/DlcOffer';
 import { FundingInput } from '../../lib/messages/FundingInput';
+import { SingleOracleInfo } from '../../lib/messages/OracleInfo';
 import {
   ContractDescriptorPre163,
   ContractDescriptorV0Pre163,
@@ -583,7 +584,9 @@ describe('DlcOffer', () => {
       it('returns post-163 instance', () => {
         const post163 = DlcOfferV0.fromPre163(pre163, temporaryContractId);
         expect(post163).to.be.instanceof(DlcOfferV0);
-        expect(post163.contractFlags).to.equal(Number(pre163.contractFlags.toString('hex')));
+        expect(post163.contractFlags).to.equal(
+          Number(pre163.contractFlags.toString('hex')),
+        );
         expect(post163.chainHash).to.equal(pre163.chainHash);
 
         expect(post163.contractInfo).to.be.instanceof(SingleContractInfo);

packages/messaging/__tests__/messages/DlcSign.spec.ts

@@ -1,14 +1,14 @@
 import { sigToDER } from '@node-lightning/crypto';
 import { expect } from 'chai';
 
-import { ScriptWitness } from '../../lib';
 import { CetAdaptorSignatures } from '../../lib/messages/CetAdaptorSignatures';
 import { DlcSign, DlcSignV0 } from '../../lib/messages/DlcSign';
 import { FundingSignatures } from '../../lib/messages/FundingSignatures';
 import { CetAdaptorSignaturesV0Pre163 } from '../../lib/messages/pre-163/CetAdaptorSignatures';
 import { DlcSignV0Pre163 } from '../../lib/messages/pre-163/DlcSign';
 import { FundingSignaturesV0Pre163 } from '../../lib/messages/pre-163/FundingSignatures';
 import { ScriptWitnessV0Pre163 } from '../../lib/messages/pre-163/ScriptWitness';
+import { ScriptWitness } from '../../lib/messages/ScriptWitness';
 
 describe('DlcSign', () => {
   let instance: DlcSignV0;

packages/messaging/__tests__/messages/FundingSignatures.spec.ts

@@ -1,5 +1,3 @@
-import { Sequence, Tx } from '@node-lightning/bitcoin';
-import { StreamReader } from '@node-lightning/bufio';
 import { expect } from 'chai';
 
 import { FundingSignatures } from '../../lib/messages/FundingSignatures';

packages/messaging/__tests__/messages/NegotiationFields.spec.ts

@@ -3,11 +3,9 @@ import { expect } from 'chai';
 import {
   DisjointNegotiationFields,
   NegotiationFields,
-  NegotiationFieldsType,
   SingleNegotiationFields,
 } from '../../lib/messages/NegotiationFields';
 import {
-  NegotiationFieldsPre163,
   NegotiationFieldsV1Pre163,
   NegotiationFieldsV2Pre163,
 } from '../../lib/messages/pre-163/NegotiationFields';

packages/messaging/__tests__/messages/OracleInfo.spec.ts

@@ -1,9 +1,10 @@
 import { expect } from 'chai';
 
-import { EnumEventDescriptorV0Pre167, OracleEventV0Pre167 } from '../../lib';
 import { SingleOracleInfo } from '../../lib/messages/OracleInfo';
 import { OracleInfoV0Pre163 } from '../../lib/messages/pre-163/OracleInfo';
+import { EnumEventDescriptorV0Pre167 } from '../../lib/messages/pre-167/EventDescriptor';
 import { OracleAnnouncementV0Pre167 } from '../../lib/messages/pre-167/OracleAnnouncement';
+import { OracleEventV0Pre167 } from '../../lib/messages/pre-167/OracleEvent';
 
 describe('OracleInfo', () => {
   const oracleAnnouncementHex =

packages/messaging/__tests__/messages/OrderAccept.spec.ts

@@ -1,9 +1,9 @@
 import { expect } from 'chai';
 
 import { OrderAcceptV0 } from '../../lib/messages/OrderAccept';
+import { OrderNegotiationFields } from '../../lib/messages/OrderNegotiationFields';
 import { OrderAcceptV0Pre163 } from '../../lib/messages/pre-163/OrderAccept';
 import { OrderNegotiationFieldsV0Pre163 } from '../../lib/messages/pre-163/OrderNegotiationFields';
-import { OrderNegotiationFields } from '../../lib/messages/OrderNegotiationFields';
 
 describe('OrderAccept', () => {
   const tempOrderId = Buffer.from(

packages/messaging/__tests__/messages/OrderOffer.spec.ts

@@ -2,11 +2,11 @@ import { expect } from 'chai';
 
 import { LOCKTIME_THRESHOLD } from '../../lib';
 import { EnumeratedContractDescriptor } from '../../lib/messages/ContractDescriptor';
-import { SingleOracleInfo } from '../../lib/messages/OracleInfo';
 import {
   ContractInfo,
   SingleContractInfo,
 } from '../../lib/messages/ContractInfo';
+import { SingleOracleInfo } from '../../lib/messages/OracleInfo';
 import { OrderIrcInfoV0 } from '../../lib/messages/OrderIrcInfo';
 import { OrderMetadataV0 } from '../../lib/messages/OrderMetadata';
 import { OrderOfferV0 } from '../../lib/messages/OrderOffer';

packages/messaging/__tests__/messages/PayoutFunction.spec.ts

@@ -3,8 +3,8 @@ import { expect } from 'chai';
 
 import { HyperbolaPayoutCurvePiece } from '../../lib/messages/PayoutCurvePiece';
 import { PayoutFunction } from '../../lib/messages/PayoutFunction';
-import { PayoutFunctionV0Pre163 } from '../../lib/messages/pre-163/PayoutFunction';
 import { HyperbolaPayoutCurvePiecePre163 } from '../../lib/messages/pre-163/PayoutCurvePiece';
+import { PayoutFunctionV0Pre163 } from '../../lib/messages/pre-163/PayoutFunction';
 
 describe('PayoutFunction', () => {
   describe('serialize', () => {

packages/messaging/__tests__/messages/RoundingInterval.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
-import { RoundingIntervals } from '../../lib';
 import { RoundingIntervalsV0Pre163 } from '../../lib/messages/pre-163/RoundingIntervals';
+import { RoundingIntervals } from '../../lib/messages/RoundingIntervals';
 
 describe('RoundingIntervals', () => {
   describe('serialize', () => {

packages/messaging/__tests__/messages/pre-163/PayoutCurvePiece.spec.ts

@@ -114,4 +114,4 @@ describe('PayoutCurvePiecePre163', () => {
       expect(instance.dSign).to.equal(false);
     });
   });
-});
+});

packages/messaging/lib/domain/Address.ts

@@ -7,7 +7,7 @@ export enum AddressType {
 export class Address {
   public static type = AddressType.IpV4;
 
-  public static deserialize(buf: Buffer) {
+  public static deserialize(buf: Buffer): Address {
     const reader = new BufferReader(buf);
     const type = reader.readBigSize(); // read off type
 
@@ -49,7 +49,7 @@ export class Address {
     this.port = port;
   }
 
-  public toString() {
+  public toString(): string {
     return `${this.host}:${this.port}`;
   }
 

packages/messaging/lib/messages/AddressCache.ts

@@ -1,7 +1,7 @@
 import { BufferReader, BufferWriter } from '@node-lightning/bufio';
+import assert from 'assert';
 import { BitcoinNetwork } from 'bitcoin-networks';
 import { address } from 'bitcoinjs-lib';
-import assert from 'assert';
 
 import { MessageType } from '../MessageType';
 

packages/messaging/lib/messages/ContractDescriptor.ts

@@ -2,7 +2,7 @@ import { BufferReader, BufferWriter } from '@node-lightning/bufio';
 import assert from 'assert';
 
 import { IDlcMessage } from './DlcMessage';
-import { PayoutFunction, IPayoutFunctionJSON } from './PayoutFunction';
+import { IPayoutFunctionJSON, PayoutFunction } from './PayoutFunction';
 import {
   ContractDescriptorPre163,
   ContractDescriptorV0Pre163,

packages/messaging/lib/messages/ContractInfo.ts

@@ -6,8 +6,8 @@ import {
   ContractDescriptor,
   ContractDescriptorType,
   IEnumContractDescriptorJSON,
-  NumericContractDescriptor,
   INumericContractDescriptorJSON,
+  NumericContractDescriptor,
 } from './ContractDescriptor';
 import { IDlcMessage } from './DlcMessage';
 import {

packages/messaging/lib/messages/DlcAccept.ts

@@ -1,13 +1,17 @@
 import { Script } from '@node-lightning/bitcoin';
 import { BufferReader, BufferWriter } from '@node-lightning/bufio';
 import { hash160, sigToDER } from '@node-lightning/crypto';
+import assert from 'assert';
 import { BitcoinNetwork } from 'bitcoin-networks';
 import { address } from 'bitcoinjs-lib';
 import secp256k1 from 'secp256k1';
-import assert from 'assert';
 
 import { MessageType } from '../MessageType';
-import { deserializeTlv, ITlv, serializeTlv } from "../serialize/deserializeTlv";
+import {
+  deserializeTlv,
+  ITlv,
+  serializeTlv,
+} from '../serialize/deserializeTlv';
 import { getTlv } from '../serialize/getTlv';
 import {
   CetAdaptorSignatures,
@@ -23,7 +27,10 @@ import {
 import { DlcAcceptV0Pre163 } from './pre-163/DlcAccept';
 
 export abstract class DlcAccept implements IDlcMessage {
-  public static deserialize(reader: Buffer | BufferReader, parseCets = true): DlcAcceptV0 {
+  public static deserialize(
+    reader: Buffer | BufferReader,
+    parseCets = true,
+  ): DlcAcceptV0 {
     if (reader instanceof Buffer) reader = new BufferReader(reader);
 
     const tempReader = new BufferReader(reader.peakBytes());
@@ -60,7 +67,10 @@ export class DlcAcceptV0 extends DlcAccept implements IDlcMessage {
    * Deserializes an oracle_info message
    * @param reader
    */
-  public static deserialize(reader: Buffer | BufferReader, parseCets = true): DlcAcceptV0 {
+  public static deserialize(
+    reader: Buffer | BufferReader,
+    parseCets = true,
+  ): DlcAcceptV0 {
     const instance = new DlcAcceptV0();
     if (reader instanceof Buffer) reader = new BufferReader(reader);
 
@@ -257,9 +267,7 @@ export class DlcAcceptV0 extends DlcAccept implements IDlcMessage {
       return acc + input.prevTx.outputs[input.prevTxVout].value.sats;
     }, BigInt(0));
     if (this.acceptCollateral >= fundingAmount) {
-      throw new Error(
-        'fundingAmount must be greater than acceptCollateral',
-      );
+      throw new Error('fundingAmount must be greater than acceptCollateral');
     }
   }
 

packages/messaging/lib/messages/DlcClose.ts

@@ -2,12 +2,16 @@ import { BufferReader, BufferWriter } from '@node-lightning/bufio';
 import assert from 'assert';
 
 import { MessageType } from '../MessageType';
+import {
+  deserializeTlv,
+  ITlv,
+  serializeTlv,
+} from '../serialize/deserializeTlv';
+import { getTlv } from '../serialize/getTlv';
 import { IDlcMessage } from './DlcMessage';
 import { FundingInput, IFundingInputJSON } from './FundingInput';
 import { FundingSignatures, IFundingSignaturesJSON } from './FundingSignatures';
-import { getTlv } from "../serialize/getTlv";
-import { deserializeTlv, ITlv, serializeTlv } from "../serialize/deserializeTlv";
-import { DlcCloseV0Pre163 } from "./pre-163/DlcClose";
+import { DlcCloseV0Pre163 } from './pre-163/DlcClose';
 
 export abstract class DlcClose {
   public static deserialize(reader: Buffer | BufferReader): DlcCloseV0 {

packages/messaging/lib/messages/DlcOffer.ts

@@ -1,10 +1,10 @@
 import { Script } from '@node-lightning/bitcoin';
 import { BufferReader, BufferWriter } from '@node-lightning/bufio';
 import { hash160 } from '@node-lightning/crypto';
+import assert from 'assert';
 import { BitcoinNetwork } from 'bitcoin-networks';
 import { address } from 'bitcoinjs-lib';
 import secp256k1 from 'secp256k1';
-import assert from 'assert';
 
 import { MessageType } from '../MessageType';
 import {
@@ -314,9 +314,7 @@ export class DlcOfferV0 extends DlcOffer implements IDlcMessage {
       return acc + input.prevTx.outputs[input.prevTxVout].value.sats;
     }, BigInt(0));
     if (this.offerCollateral >= fundingAmount) {
-      throw new Error(
-        'fundingAmount must be greater than offerCollateral',
-      );
+      throw new Error('fundingAmount must be greater than offerCollateral');
     }
   }
 

packages/messaging/lib/messages/DlcSign.ts

@@ -3,7 +3,11 @@ import { sigToDER } from '@node-lightning/crypto';
 import assert from 'assert';
 
 import { MessageType } from '../MessageType';
-import { deserializeTlv, ITlv, serializeTlv } from "../serialize/deserializeTlv";
+import {
+  deserializeTlv,
+  ITlv,
+  serializeTlv,
+} from '../serialize/deserializeTlv';
 import { getTlv } from '../serialize/getTlv';
 import {
   CetAdaptorSignatures,
@@ -92,9 +96,7 @@ export class DlcSignV0 extends DlcSign implements IDlcMessage {
     const instance = new DlcSignV0Pre163();
 
     instance.contractId = sign.contractId;
-    instance.cetSignatures = CetAdaptorSignatures.toPre163(
-      sign.cetSignatures,
-    );
+    instance.cetSignatures = CetAdaptorSignatures.toPre163(sign.cetSignatures);
     instance.refundSignature = sign.refundSignature;
     instance.fundingSignatures = FundingSignatures.toPre163(
       sign.fundingSignatures,

packages/messaging/lib/messages/DlcTransactions.ts

@@ -11,7 +11,10 @@ import { IDlcMessage } from './DlcMessage';
 import { DlcTransactionsV0Pre163 } from './pre-163/DlcTransactions';
 
 export abstract class DlcTransactions {
-  public static deserialize(reader: Buffer | BufferReader, parseCets = true): DlcTransactionsV0 {
+  public static deserialize(
+    reader: Buffer | BufferReader,
+    parseCets = true,
+  ): DlcTransactionsV0 {
     if (reader instanceof Buffer) reader = new BufferReader(reader);
 
     const tempReader = new BufferReader(reader.peakBytes());
@@ -44,7 +47,10 @@ export class DlcTransactionsV0 extends DlcTransactions implements IDlcMessage {
    * Deserializes an offer_dlc_v0 message
    * @param reader
    */
-  public static deserialize(reader: Buffer | BufferReader, parseCets = true): DlcTransactionsV0 {
+  public static deserialize(
+    reader: Buffer | BufferReader,
+    parseCets = true,
+  ): DlcTransactionsV0 {
     const instance = new DlcTransactionsV0();
     if (reader instanceof Buffer) reader = new BufferReader(reader);
 

packages/messaging/lib/messages/FundingSignatures.ts

@@ -2,8 +2,8 @@ import { BufferReader, BufferWriter } from '@node-lightning/bufio';
 
 import { IDlcMessage } from './DlcMessage';
 import { FundingSignaturesV0Pre163 } from './pre-163/FundingSignatures';
-import { IScriptWitnessJSON, ScriptWitness } from './ScriptWitness';
 import { ScriptWitnessV0Pre163 } from './pre-163/ScriptWitness';
+import { IScriptWitnessJSON, ScriptWitness } from './ScriptWitness';
 
 /**
  * FundingSignatures V0 contains signatures of the funding transaction