refactor: organize imports (typescript)

antonilol · Nov 7, 2024 · 49adbcf · 49adbcf
1 parent eb2a095
commit 49adbcf
Show file tree

Hide file tree

Showing 22 changed files with 85 additions and 86 deletions.
diff --git a/addresses.js b/addresses.js
diff --git a/addresses.ts b/addresses.ts
@@ -1,9 +1,9 @@
 import { strict as assert } from 'assert';
-import * as curve from 'tiny-secp256k1';
 import * as bitcoin from 'bitcoinjs-lib';
+import { ECPairFactory, ECPairInterface } from 'ecpair';
 import { Keccak } from 'sha3';
+import * as curve from 'tiny-secp256k1';
 import { input } from './btc';
-import { ECPairFactory, ECPairInterface } from 'ecpair';
 import { descsumCreate } from './descriptors';
 
 const mainnet = bitcoin.networks.bitcoin;

diff --git a/btc.js b/btc.js
diff --git a/btc.ts b/btc.ts
@@ -1,10 +1,10 @@
-import { spawn } from 'child_process';
+import { strict as assert } from 'assert';
 import * as bitcoin from 'bitcoinjs-lib';
-import * as curve from 'tiny-secp256k1';
+import { spawn } from 'child_process';
+import { ECPairFactory, ECPairInterface } from 'ecpair';
 import { createInterface } from 'readline';
 import { Writable } from 'stream';
-import { ECPairFactory, ECPairInterface } from 'ecpair';
-import { strict as assert } from 'assert';
+import * as curve from 'tiny-secp256k1';
 
 export { descsumCreate } from './descriptors';
 

diff --git a/ecdh_stealth.js b/ecdh_stealth.js
diff --git a/ecdh_stealth.ts b/ecdh_stealth.ts
@@ -1,7 +1,7 @@
-import * as curve from 'tiny-secp256k1';
 import * as bitcoin from 'bitcoinjs-lib';
 import bs58check from 'bs58check';
 import { randomBytes } from 'crypto';
+import * as curve from 'tiny-secp256k1';
 
 export class StealthAddress {
     readonly spendPriv?: Buffer;

diff --git a/ecdh_stealth_test.js b/ecdh_stealth_test.js
diff --git a/ecdh_stealth_test.ts b/ecdh_stealth_test.ts
@@ -1,9 +1,9 @@
-import * as curve from 'tiny-secp256k1';
+import { strict as assert } from 'assert';
 import * as bitcoin from 'bitcoinjs-lib';
-import { send, setChain, getnewaddress, fundOutputScript, p2pkh } from './btc';
 import { randomBytes } from 'crypto';
-import { strict as assert } from 'assert';
 import { ECPairFactory } from 'ecpair';
+import * as curve from 'tiny-secp256k1';
+import { fundOutputScript, getnewaddress, p2pkh, send, setChain } from './btc';
 import { StealthAddress } from './ecdh_stealth';
 
 setChain('regtest');

diff --git a/ecdsa_sigdata.js b/ecdsa_sigdata.js
diff --git a/ecdsa_sigdata.ts b/ecdsa_sigdata.ts
@@ -1,9 +1,9 @@
-import { setChain, send, getnewaddress, fundOutputScript, ecPrivateMul, ecPrivateDiv, p2pkh } from './btc';
-import * as curve from 'tiny-secp256k1';
-import { ECPairFactory } from 'ecpair';
+import { strict as assert } from 'assert';
 import * as bitcoin from 'bitcoinjs-lib';
 import * as crypto from 'crypto';
-import { strict as assert } from 'assert';
+import { ECPairFactory } from 'ecpair';
+import * as curve from 'tiny-secp256k1';
+import { ecPrivateDiv, ecPrivateMul, fundOutputScript, getnewaddress, p2pkh, send, setChain } from './btc';
 
 setChain('regtest');
 

diff --git a/lightning/lndforcecloser.js b/lightning/lndforcecloser.js
diff --git a/lightning/lndforcecloser.ts b/lightning/lndforcecloser.ts
@@ -1,13 +1,13 @@
-import * as bitcoin from 'bitcoinjs-lib';
-import { btc, setChain, input } from '../btc';
-import * as curve from 'tiny-secp256k1';
-import { ECPairFactory } from 'ecpair';
+import { strict as assert } from 'assert';
 import { BIP32Factory } from 'bip32';
+import * as bitcoin from 'bitcoinjs-lib';
 import { execSync } from 'child_process';
+import { ECPairFactory } from 'ecpair';
 import { homedir } from 'os';
-import { strict as assert } from 'assert';
+import * as curve from 'tiny-secp256k1';
+import { btc, input, setChain } from '../btc';
 
-import { parseChannelDB, Channel } from './channeldb_reader';
+import { Channel, parseChannelDB } from './channeldb_reader';
 
 const ECPair = ECPairFactory(curve);
 const bip32 = BIP32Factory(curve);

diff --git a/merkle_tree.js b/merkle_tree.js
diff --git a/merkle_tree.ts b/merkle_tree.ts
@@ -1,5 +1,5 @@
-import * as bitcoin from 'bitcoinjs-lib';
 import { strict as assert } from 'assert';
+import * as bitcoin from 'bitcoinjs-lib';
 
 type Txid = string | Buffer;
 

diff --git a/miner.js b/miner.js
diff --git a/miner.ts b/miner.ts
@@ -1,25 +1,24 @@
-import { ChildProcessWithoutNullStreams, spawn } from 'child_process';
 import * as bitcoin from 'bitcoinjs-lib';
+import { ChildProcessWithoutNullStreams, spawn } from 'child_process';
+import { randomBytes } from 'crypto';
+import { ECPairFactory } from 'ecpair';
+import { copyFileSync, existsSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from 'fs';
+import { dirname } from 'path';
+import * as curve from 'tiny-secp256k1';
 import {
-    btc,
-    bech32toScriptPubKey,
-    getBlockTemplate,
     BlockTemplate,
     BlockTemplateTX,
     TemplateRequest,
-    consoleTrace,
+    bech32toScriptPubKey,
+    btc,
+    encodeVarUintLE,
+    getBlockTemplate,
     insertTransaction,
+    network,
     removeTransaction,
     setChain,
-    network,
-    encodeVarUintLE,
 } from './btc';
 import { merkleRoot } from './merkle_tree';
-import { randomBytes } from 'crypto';
-import { writeFileSync, unlinkSync, copyFileSync, readFileSync, readdirSync, existsSync } from 'fs';
-import { dirname } from 'path';
-import * as curve from 'tiny-secp256k1';
-import { ECPairFactory } from 'ecpair';
 
 const ECPair = ECPairFactory(curve);
 

diff --git a/p2tr_ptlc.js b/p2tr_ptlc.js
diff --git a/p2tr_ptlc.ts b/p2tr_ptlc.ts
@@ -1,19 +1,19 @@
-import * as curve from 'tiny-secp256k1';
+import { strict as assert } from 'assert';
 import * as bitcoin from 'bitcoinjs-lib';
+import { randomBytes } from 'crypto';
+import { ECPairFactory, ECPairInterface } from 'ecpair';
+import * as curve from 'tiny-secp256k1';
 import {
     btc,
-    send,
+    cloneBuf,
     createTaprootOutput,
     ecPrivateMul,
-    negateIfOddPubkey,
-    cloneBuf,
     input,
-    tapLeaf,
+    negateIfOddPubkey,
+    send,
     sleep,
+    tapLeaf,
 } from './btc';
-import { ECPairFactory, ECPairInterface } from 'ecpair';
-import { randomBytes } from 'crypto';
-import { strict as assert } from 'assert';
 
 const ECPair = ECPairFactory(curve);
 

diff --git a/p2tr_tapscript.js b/p2tr_tapscript.js
diff --git a/p2tr_tapscript.ts b/p2tr_tapscript.ts
@@ -1,19 +1,19 @@
-import * as curve from 'tiny-secp256k1';
 import * as bitcoin from 'bitcoinjs-lib';
+import { randomBytes } from 'crypto';
+import { ECPairFactory } from 'ecpair';
+import * as curve from 'tiny-secp256k1';
 import {
-    send,
     bech32toScriptPubKey,
+    createTaprootOutput,
+    decodeRawTransaction,
     fundAddress,
     getnewaddress,
-    decodeRawTransaction,
     negateIfOddPubkey,
-    tapLeaf,
-    tapBranch,
-    createTaprootOutput,
     OP_CHECKSIGADD,
+    send,
+    tapBranch,
+    tapLeaf,
 } from './btc';
-import { ECPairFactory } from 'ecpair';
-import { randomBytes } from 'crypto';
 
 const ECPair = ECPairFactory(curve);
 

diff --git a/xpriv.js b/xpriv.js
diff --git a/xpriv.ts b/xpriv.ts
@@ -1,9 +1,9 @@
-import { input } from './btc';
-import * as bitcoin from 'bitcoinjs-lib';
 import { strict as assert } from 'assert';
-import * as bs58 from 'bs58';
 import BIP32Factory, { BIP32Interface } from 'bip32';
+import * as bitcoin from 'bitcoinjs-lib';
+import * as bs58 from 'bs58';
 import * as curve from 'tiny-secp256k1';
+import { input } from './btc';
 
 const bip32 = BIP32Factory(curve);