From 908b92af71aea75cb00da76ac2918ed3acfbc9cf Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Fri, 16 Dec 2022 18:01:04 +0100 Subject: [PATCH] Remove pools.json download from the frontend --- frontend/cypress/e2e/liquid/liquid.spec.ts | 1 - frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts | 1 - frontend/cypress/e2e/mainnet/mainnet.spec.ts | 1 - frontend/proxy.conf.js | 4 ++-- frontend/sync-assets.js | 3 --- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/frontend/cypress/e2e/liquid/liquid.spec.ts b/frontend/cypress/e2e/liquid/liquid.spec.ts index 1e7c4649d..e24b19fad 100644 --- a/frontend/cypress/e2e/liquid/liquid.spec.ts +++ b/frontend/cypress/e2e/liquid/liquid.spec.ts @@ -7,7 +7,6 @@ describe('Liquid', () => { cy.intercept('/liquid/api/blocks/').as('blocks'); cy.intercept('/liquid/api/tx/**/outspends').as('outspends'); cy.intercept('/liquid/api/block/**/txs/**').as('block-txs'); - cy.intercept('/resources/pools.json').as('pools'); Cypress.Commands.add('waitForBlockData', () => { cy.wait('@socket'); diff --git a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts index 3ca23425e..5cf6cf331 100644 --- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts +++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts @@ -7,7 +7,6 @@ describe('Liquid Testnet', () => { cy.intercept('/liquidtestnet/api/blocks/').as('blocks'); cy.intercept('/liquidtestnet/api/tx/**/outspends').as('outspends'); cy.intercept('/liquidtestnet/api/block/**/txs/**').as('block-txs'); - cy.intercept('/resources/pools.json').as('pools'); Cypress.Commands.add('waitForBlockData', () => { cy.wait('@socket'); diff --git a/frontend/cypress/e2e/mainnet/mainnet.spec.ts b/frontend/cypress/e2e/mainnet/mainnet.spec.ts index 4cc9a64c9..d6fe94dac 100644 --- a/frontend/cypress/e2e/mainnet/mainnet.spec.ts +++ b/frontend/cypress/e2e/mainnet/mainnet.spec.ts @@ -41,7 +41,6 @@ describe('Mainnet', () => { // cy.intercept('/api/v1/block/*/summary').as('block-summary'); // cy.intercept('/api/v1/outspends/*').as('outspends'); // cy.intercept('/api/tx/*/outspends').as('tx-outspends'); - // cy.intercept('/resources/pools.json').as('pools'); // Search Auto Complete cy.intercept('/api/address-prefix/1wiz').as('search-1wiz'); diff --git a/frontend/proxy.conf.js b/frontend/proxy.conf.js index ab2240c03..f5384bef0 100644 --- a/frontend/proxy.conf.js +++ b/frontend/proxy.conf.js @@ -76,7 +76,7 @@ PROXY_CONFIG = [ if (configContent && configContent.BASE_MODULE == "liquid") { PROXY_CONFIG.push({ - context: ['/resources/pools.json', + context: [ '/resources/assets.json', '/resources/assets.minimal.json', '/resources/assets-testnet.json', '/resources/assets-testnet.minimal.json'], target: "https://liquid.network", @@ -85,7 +85,7 @@ if (configContent && configContent.BASE_MODULE == "liquid") { }); } else { PROXY_CONFIG.push({ - context: ['/resources/pools.json', '/resources/assets.json', '/resources/assets.minimal.json', '/resources/worldmap.json'], + context: ['/resources/assets.json', '/resources/assets.minimal.json', '/resources/worldmap.json'], target: "https://mempool.space", secure: false, changeOrigin: true, diff --git a/frontend/sync-assets.js b/frontend/sync-assets.js index 9c447bf7d..0f2e0ec64 100644 --- a/frontend/sync-assets.js +++ b/frontend/sync-assets.js @@ -66,7 +66,6 @@ function downloadMiningPoolLogos() { }) } -const poolsJsonUrl = 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json'; let assetsJsonUrl = 'https://raw.githubusercontent.com/mempool/asset_registry_db/master/index.json'; let assetsMinimalJsonUrl = 'https://raw.githubusercontent.com/mempool/asset_registry_db/master/index.minimal.json'; @@ -82,8 +81,6 @@ console.log('Downloading assets'); download(PATH + 'assets.json', assetsJsonUrl); console.log('Downloading assets minimal'); download(PATH + 'assets.minimal.json', assetsMinimalJsonUrl); -console.log('Downloading mining pools info'); -download(PATH + 'pools.json', poolsJsonUrl); console.log('Downloading testnet assets'); download(PATH + 'assets-testnet.json', testnetAssetsJsonUrl); console.log('Downloading testnet assets minimal');