Skip to content

Commit

Permalink
chore: much prettier (shapeshift#352)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrnerdhair authored Feb 10, 2022
1 parent 8b04cf8 commit 40dda7c
Show file tree
Hide file tree
Showing 15 changed files with 108 additions and 130 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"jest": "^27.1.0",
"jest-mock-extended": "^1.0.9",
"lerna": "^4.0.0",
"prettier": "2.2.1",
"prettier": "2.5.1",
"rimraf": "^3.0.2",
"semantic-release": "^17.4.7",
"semantic-release-monorepo": "^7.0.5",
Expand Down
21 changes: 8 additions & 13 deletions packages/asset-service/src/generateAssetData/generateAssetData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,14 @@ const generateAssetData = async () => {
const generatedAssetData = await Promise.all(
baseAssets.map(async (baseAsset) => {
if (baseAsset.chain === ChainTypes.Ethereum && baseAsset.network === NetworkTypes.MAINNET) {
const [
ethTokens,
yearnVaults,
ironBankTokens,
zapperTokens,
underlyingTokens
] = await Promise.all([
await getTokens(),
await getYearnVaults(),
await getIronBankTokens(),
await getZapperTokens(),
await getUnderlyingVaultTokens()
])
const [ethTokens, yearnVaults, ironBankTokens, zapperTokens, underlyingTokens] =
await Promise.all([
await getTokens(),
await getYearnVaults(),
await getIronBankTokens(),
await getZapperTokens(),
await getUnderlyingVaultTokens()
])
const tokens = [
...ethTokens,
...yearnVaults,
Expand Down
4 changes: 1 addition & 3 deletions packages/chain-adapters/src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ export type ChainAdapter<T extends ChainTypes> = {

getTxHistory(input: chainAdapters.TxHistoryInput): Promise<chainAdapters.TxHistoryResponse<T>>

buildSendTransaction(
input: chainAdapters.BuildSendTxInput<T>
): Promise<{
buildSendTransaction(input: chainAdapters.BuildSendTxInput<T>): Promise<{
txToSign: chainAdapters.ChainTxType<T>
}>

Expand Down
15 changes: 5 additions & 10 deletions packages/chain-adapters/src/bitcoin/BitcoinChainAdapter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,8 @@ const getTransactionMockResponse = {
txid: 'feab0ffe497740fcc8bcab9c5b12872c4302e629ee8ccc35ed4f6057fc7a4580',
vout: 1,
scriptSig: {
asm:
'3045022100cd627a0577d35454ced7f0a6ef8a3d3cf11c0f8696bda18062025478e0fc866002206c8ac559dc6bd851bdf00e33c1602fcaeee9d16b35d21b548529825f12dfe5ad[ALL] 027751a74f251ba2657ec2a2f374ce7d5ba1548359749823a59314c54a0670c126',
hex:
'483045022100cd627a0577d35454ced7f0a6ef8a3d3cf11c0f8696bda18062025478e0fc866002206c8ac559dc6bd851bdf00e33c1602fcaeee9d16b35d21b548529825f12dfe5ad0121027751a74f251ba2657ec2a2f374ce7d5ba1548359749823a59314c54a0670c126'
asm: '3045022100cd627a0577d35454ced7f0a6ef8a3d3cf11c0f8696bda18062025478e0fc866002206c8ac559dc6bd851bdf00e33c1602fcaeee9d16b35d21b548529825f12dfe5ad[ALL] 027751a74f251ba2657ec2a2f374ce7d5ba1548359749823a59314c54a0670c126',
hex: '483045022100cd627a0577d35454ced7f0a6ef8a3d3cf11c0f8696bda18062025478e0fc866002206c8ac559dc6bd851bdf00e33c1602fcaeee9d16b35d21b548529825f12dfe5ad0121027751a74f251ba2657ec2a2f374ce7d5ba1548359749823a59314c54a0670c126'
},
sequence: 4294967295
}
Expand All @@ -99,17 +97,15 @@ const getTransactionMockResponse = {
value: 0.00057203,
n: 1,
scriptPubKey: {
asm:
'OP_DUP OP_HASH160 b22138dfe140e4611b98bdb728eed04beed754c4 OP_EQUALVERIFY OP_CHECKSIG',
asm: 'OP_DUP OP_HASH160 b22138dfe140e4611b98bdb728eed04beed754c4 OP_EQUALVERIFY OP_CHECKSIG',
hex: '76a914b22138dfe140e4611b98bdb728eed04beed754c488ac',
reqSigs: 1,
type: 'pubkeyhash',
addresses: ['1HEs5TpTvrWHDFqLqfZnXFLFc4hqHjHe5M']
}
}
],
hex:
'010000000180457afc57604fed35cc8cee29e602432c87125b9cabbcc8fc407749fe0fabfe010000006b483045022100cd627a0577d35454ced7f0a6ef8a3d3cf11c0f8696bda18062025478e0fc866002206c8ac559dc6bd851bdf00e33c1602fcaeee9d16b35d21b548529825f12dfe5ad0121027751a74f251ba2657ec2a2f374ce7d5ba1548359749823a59314c54a0670c126ffffffff02d97c0000000000001600140c0585f37ff3f9f127c9788941d6082cf7aa012173df0000000000001976a914b22138dfe140e4611b98bdb728eed04beed754c488ac00000000',
hex: '010000000180457afc57604fed35cc8cee29e602432c87125b9cabbcc8fc407749fe0fabfe010000006b483045022100cd627a0577d35454ced7f0a6ef8a3d3cf11c0f8696bda18062025478e0fc866002206c8ac559dc6bd851bdf00e33c1602fcaeee9d16b35d21b548529825f12dfe5ad0121027751a74f251ba2657ec2a2f374ce7d5ba1548359749823a59314c54a0670c126ffffffff02d97c0000000000001600140c0585f37ff3f9f127c9788941d6082cf7aa012173df0000000000001976a914b22138dfe140e4611b98bdb728eed04beed754c488ac00000000',
blockhash: '000000000000000000033c8ec44721d844aa63f4312d65261eb4c4d0cd4e0379',
confirmations: 2,
time: 1634662208,
Expand Down Expand Up @@ -312,8 +308,7 @@ describe('BitcoinChainAdapter', () => {
amount: '31961',
vout: 0,
txid: 'adb979b44c86393236e307c45f9578d9bd064134a2779b4286c158c51ad4ab05',
hex:
'010000000180457afc57604fed35cc8cee29e602432c87125b9cabbcc8fc407749fe0fabfe010000006b483045022100cd627a0577d35454ced7f0a6ef8a3d3cf11c0f8696bda18062025478e0fc866002206c8ac559dc6bd851bdf00e33c1602fcaeee9d16b35d21b548529825f12dfe5ad0121027751a74f251ba2657ec2a2f374ce7d5ba1548359749823a59314c54a0670c126ffffffff02d97c0000000000001600140c0585f37ff3f9f127c9788941d6082cf7aa012173df0000000000001976a914b22138dfe140e4611b98bdb728eed04beed754c488ac00000000'
hex: '010000000180457afc57604fed35cc8cee29e602432c87125b9cabbcc8fc407749fe0fabfe010000006b483045022100cd627a0577d35454ced7f0a6ef8a3d3cf11c0f8696bda18062025478e0fc866002206c8ac559dc6bd851bdf00e33c1602fcaeee9d16b35d21b548529825f12dfe5ad0121027751a74f251ba2657ec2a2f374ce7d5ba1548359749823a59314c54a0670c126ffffffff02d97c0000000000001600140c0585f37ff3f9f127c9788941d6082cf7aa012173df0000000000001976a914b22138dfe140e4611b98bdb728eed04beed754c488ac00000000'
}
],
outputs: [
Expand Down
4 changes: 1 addition & 3 deletions packages/chain-adapters/src/bitcoin/BitcoinChainAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,7 @@ export class ChainAdapter implements IChainAdapter<ChainTypes.Bitcoin> {
}
}

async buildSendTransaction(
tx: chainAdapters.BuildSendTxInput<ChainTypes.Bitcoin>
): Promise<{
async buildSendTransaction(tx: chainAdapters.BuildSendTxInput<ChainTypes.Bitcoin>): Promise<{
txToSign: chainAdapters.ChainTxType<ChainTypes.Bitcoin>
}> {
try {
Expand Down
Loading

0 comments on commit 40dda7c

Please sign in to comment.