Commit 838bd1ac authored by Mark Tyneway's avatar Mark Tyneway Committed by Kelvin Fichter

state-surgery: remove dead l1 provider

Just the the `ethProvider` to deduplicate usage of a provider.
They both are connected to the same thing, so this removes config.
parent dc034be4
...@@ -145,10 +145,6 @@ export const loadSurgeryData = async ( ...@@ -145,10 +145,6 @@ export const loadSurgeryData = async (
ropstenProvider ropstenProvider
) )
// Get a reference to the L1 provider.
console.log('Connecting to L1 provider...')
const l1Provider = new ethers.providers.JsonRpcProvider(configs.l1ProviderUrl)
// Get a reference to an ETH (mainnet) provider. // Get a reference to an ETH (mainnet) provider.
console.log('Connecting to ETH provider...') console.log('Connecting to ETH provider...')
const ethProvider = new ethers.providers.JsonRpcProvider( const ethProvider = new ethers.providers.JsonRpcProvider(
...@@ -165,7 +161,6 @@ export const loadSurgeryData = async ( ...@@ -165,7 +161,6 @@ export const loadSurgeryData = async (
etherscanDump, etherscanDump,
ropstenProvider, ropstenProvider,
ropstenWallet, ropstenWallet,
l1Provider,
l2Provider, l2Provider,
ethProvider, ethProvider,
} }
......
...@@ -7,7 +7,6 @@ export interface SurgeryConfigs { ...@@ -7,7 +7,6 @@ export interface SurgeryConfigs {
outputFilePath: string outputFilePath: string
l2NetworkName: SupportedNetworks l2NetworkName: SupportedNetworks
l2ProviderUrl: string l2ProviderUrl: string
l1ProviderUrl: string
ropstenProviderUrl: string ropstenProviderUrl: string
ropstenPrivateKey: string ropstenPrivateKey: string
ethProviderUrl: string ethProviderUrl: string
...@@ -99,7 +98,6 @@ export interface SurgeryDataSources { ...@@ -99,7 +98,6 @@ export interface SurgeryDataSources {
etherscanDump: EtherscanContract[] etherscanDump: EtherscanContract[]
ropstenProvider: ethers.providers.JsonRpcProvider ropstenProvider: ethers.providers.JsonRpcProvider
ropstenWallet: ethers.Wallet ropstenWallet: ethers.Wallet
l1Provider: ethers.providers.JsonRpcProvider
l2Provider: ethers.providers.JsonRpcProvider l2Provider: ethers.providers.JsonRpcProvider
ethProvider: ethers.providers.JsonRpcProvider ethProvider: ethers.providers.JsonRpcProvider
} }
......
...@@ -131,7 +131,6 @@ export const loadConfigs = (): SurgeryConfigs => { ...@@ -131,7 +131,6 @@ export const loadConfigs = (): SurgeryConfigs => {
const outputFilePath = reqenv('REGEN__OUTPUT_FILE') const outputFilePath = reqenv('REGEN__OUTPUT_FILE')
const l2NetworkName = reqenv('REGEN__L2_NETWORK_NAME') const l2NetworkName = reqenv('REGEN__L2_NETWORK_NAME')
const l2ProviderUrl = reqenv('REGEN__L2_PROVIDER_URL') const l2ProviderUrl = reqenv('REGEN__L2_PROVIDER_URL')
const l1ProviderUrl = reqenv('REGEN__L1_PROVIDER_URL')
const ropstenProviderUrl = reqenv('REGEN__ROPSTEN_PROVIDER_URL') const ropstenProviderUrl = reqenv('REGEN__ROPSTEN_PROVIDER_URL')
const ropstenPrivateKey = reqenv('REGEN__ROPSTEN_PRIVATE_KEY') const ropstenPrivateKey = reqenv('REGEN__ROPSTEN_PRIVATE_KEY')
const ethProviderUrl = reqenv('REGEN__ETH_PROVIDER_URL') const ethProviderUrl = reqenv('REGEN__ETH_PROVIDER_URL')
...@@ -152,7 +151,6 @@ export const loadConfigs = (): SurgeryConfigs => { ...@@ -152,7 +151,6 @@ export const loadConfigs = (): SurgeryConfigs => {
outputFilePath, outputFilePath,
l2NetworkName: l2NetworkName as SupportedNetworks, l2NetworkName: l2NetworkName as SupportedNetworks,
l2ProviderUrl, l2ProviderUrl,
l1ProviderUrl,
ropstenProviderUrl, ropstenProviderUrl,
ropstenPrivateKey, ropstenPrivateKey,
ethProviderUrl, ethProviderUrl,
......
...@@ -53,7 +53,7 @@ describe('uniswap contracts', () => { ...@@ -53,7 +53,7 @@ describe('uniswap contracts', () => {
const l2Code = await env.postL2Provider.getCode( const l2Code = await env.postL2Provider.getCode(
postUniswapV3Factory.address postUniswapV3Factory.address
) )
const l1Code = await env.surgeryDataSources.l1Provider.getCode( const l1Code = await env.surgeryDataSources.ethProvider.getCode(
postUniswapV3Factory.address postUniswapV3Factory.address
) )
expect(l2Code).to.not.equal('0x') expect(l2Code).to.not.equal('0x')
...@@ -64,7 +64,7 @@ describe('uniswap contracts', () => { ...@@ -64,7 +64,7 @@ describe('uniswap contracts', () => {
describe('V3 NFPM', () => { describe('V3 NFPM', () => {
it('should have the same code as on mainnet', async () => { it('should have the same code as on mainnet', async () => {
let l2Code = await env.postL2Provider.getCode(UNISWAP_V3_NFPM_ADDRESS) let l2Code = await env.postL2Provider.getCode(UNISWAP_V3_NFPM_ADDRESS)
const l1Code = await env.surgeryDataSources.l1Provider.getCode( const l1Code = await env.surgeryDataSources.ethProvider.getCode(
UNISWAP_V3_NFPM_ADDRESS UNISWAP_V3_NFPM_ADDRESS
) )
expect(l2Code).to.not.equal('0x') expect(l2Code).to.not.equal('0x')
...@@ -98,7 +98,7 @@ describe('uniswap contracts', () => { ...@@ -98,7 +98,7 @@ describe('uniswap contracts', () => {
const l2Code = await env.postL2Provider.getCode( const l2Code = await env.postL2Provider.getCode(
postPoolContract.address postPoolContract.address
) )
const l1Code = await env.surgeryDataSources.l1Provider.getCode( const l1Code = await env.surgeryDataSources.ethProvider.getCode(
postPoolContract.address postPoolContract.address
) )
expect(l2Code).to.not.equal('0x') expect(l2Code).to.not.equal('0x')
...@@ -186,7 +186,7 @@ describe('uniswap contracts', () => { ...@@ -186,7 +186,7 @@ describe('uniswap contracts', () => {
describe(`uniswap contract at address ${acc.address}`, () => { describe(`uniswap contract at address ${acc.address}`, () => {
it('should have the same code as on mainnet', async () => { it('should have the same code as on mainnet', async () => {
const l2Code = await env.postL2Provider.getCode(acc.address) const l2Code = await env.postL2Provider.getCode(acc.address)
const l1Code = await env.surgeryDataSources.l1Provider.getCode( const l1Code = await env.surgeryDataSources.ethProvider.getCode(
acc.address acc.address
) )
expect(l2Code).to.not.equal('0x') expect(l2Code).to.not.equal('0x')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment