From e1abaa1047a3fcb0898fa3297503bd404cd1d35c Mon Sep 17 00:00:00 2001
From: Adam Goth <adamgoth@gmail.com>
Date: Wed, 6 Oct 2021 12:49:34 +0200
Subject: [PATCH] Clean up

---
 .../contracts/contract-info.json                  |  6 ++----
 packages/dai-plugin-migrations/src/index.js       |  2 --
 packages/dai/scripts/repl.js                      | 15 ---------------
 packages/dai/src/Maker.js                         |  1 -
 packages/dai/test/helpers/serviceBuilders.js      |  2 +-
 5 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/packages/dai-plugin-liquidations/contracts/contract-info.json b/packages/dai-plugin-liquidations/contracts/contract-info.json
index 85fdc99fa..1669571bd 100644
--- a/packages/dai-plugin-liquidations/contracts/contract-info.json
+++ b/packages/dai-plugin-liquidations/contracts/contract-info.json
@@ -2,8 +2,7 @@
   "chief": {
     "inception_block": {
       "mainnet": "0x487813",
-      "kovan": "0x649575",
-      "goerli": "0x649575"
+      "kovan": "0x649575"
     },
     "events": {
       "etch": "0x4f0892983790f53eea39a7a496f6cb40e8811b313871337b6a761efc6c67bb1f",
@@ -16,8 +15,7 @@
   "pause": {
     "inception_block": {
       "mainnet": "8928171",
-      "kovan": "14764552",
-      "goerli": "14764552"
+      "kovan": "14764552"
     },
     "events": {
       "exec": "0x168ccd6700000000000000000000000000000000000000000000000000000000",
diff --git a/packages/dai-plugin-migrations/src/index.js b/packages/dai-plugin-migrations/src/index.js
index 8fbbbcda4..72bd46094 100644
--- a/packages/dai-plugin-migrations/src/index.js
+++ b/packages/dai-plugin-migrations/src/index.js
@@ -1,7 +1,6 @@
 import { createCurrency } from '@makerdao/currency';
 import testnetAddresses from '../contracts/addresses/testnet.json';
 import kovanAddresses from '../contracts/addresses/kovan.json';
-import goerliAddresses from '../contracts/addresses/goerli.json';
 import mainnetAddresses from '../contracts/addresses/mainnet.json';
 import abiMap from '../contracts/abiMap';
 import MigrationService from './MigrationService';
@@ -20,7 +19,6 @@ const allContracts = Object.entries(testnetAddresses).reduce(
         address: {
           testnet: testnetAddress,
           kovan: kovanAddresses[name],
-          goerli: goerliAddresses[name],
           mainnet: mainnetAddresses[name]
         }
       };
diff --git a/packages/dai/scripts/repl.js b/packages/dai/scripts/repl.js
index ade7af6e8..455e33823 100644
--- a/packages/dai/scripts/repl.js
+++ b/packages/dai/scripts/repl.js
@@ -53,21 +53,6 @@ const env = {
       }
     }
   },
-  goerli: {
-    // TODO update for goerli
-    fromBlock: 4750000,
-    config: {
-      url: 'https://kovan.infura.io/v3/c3f0f26a4c1742e0949d8eedfc47be67',
-      privateKey: process.env.KOVAN_PRIVATE_KEY,
-      smartContract: { addressOverrides },
-      token: {
-        addressOverrides: {
-          PETH: addressOverrides.SAI_SKR,
-          DAI: addressOverrides.SAI_SAI
-        }
-      }
-    }
-  },
   mainnet: {
     config: {
       fromBlock: 4750000,
diff --git a/packages/dai/src/Maker.js b/packages/dai/src/Maker.js
index 639637e64..d651d97f7 100644
--- a/packages/dai/src/Maker.js
+++ b/packages/dai/src/Maker.js
@@ -110,7 +110,6 @@ function mergeOptions(object, source) {
 }
 
 Maker.create = async function(...args) {
-  console.log({ args });
   const [preset, options = {}] = args;
   const { plugins, ...otherOptions } = options;
 
diff --git a/packages/dai/test/helpers/serviceBuilders.js b/packages/dai/test/helpers/serviceBuilders.js
index ce14a0d84..0f6f026b7 100644
--- a/packages/dai/test/helpers/serviceBuilders.js
+++ b/packages/dai/test/helpers/serviceBuilders.js
@@ -18,7 +18,7 @@ export const kovanProviderConfig = {
 export const goerliProviderConfig = {
   // TODO update for goerli
   web3: {
-    privateKey: process.env.KOVAN_PRIVATE_KEY,
+    privateKey: process.env.GOERLI_PRIVATE_KEY,
     provider: {
       type: ProviderType.INFURA,
       network: 'kovan',