Removed terraform references to verification_pool_url

celo-org · Nov 14, 2019 · 7878dba · 7878dba
1 parent 68b948c
commit 7878dba
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 28 deletions.
diff --git a/packages/celotool/src/lib/env-utils.ts b/packages/celotool/src/lib/env-utils.ts
@@ -31,7 +31,6 @@ export enum envVar {
   EPOCH = 'EPOCH',
   ETHSTATS_DOCKER_IMAGE_REPOSITORY = 'ETHSTATS_DOCKER_IMAGE_REPOSITORY',
   ETHSTATS_DOCKER_IMAGE_TAG = 'ETHSTATS_DOCKER_IMAGE_TAG',
-  ETHSTATS_WEBSOCKETSECRET = 'ETHSTATS_WEBSOCKETSECRET',
   ETHSTATS_TRUSTED_ENODES = 'ETHSTATS_TRUSTED_ENODES',
   ETHSTATS_BANNED_ENODES = 'ETHSTATS_BANNED_ENODES',
   GETH_ACCOUNT_SECRET = 'GETH_ACCOUNT_SECRET',
@@ -72,7 +71,6 @@ export enum envVar {
   TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG = 'TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG',
   TX_NODES = 'TX_NODES',
   VALIDATORS = 'VALIDATORS',
-  VERIFICATION_POOL_URL = 'VERIFICATION_POOL_URL',
   VM_BASED = 'VM_BASED',
 }
 

diff --git a/packages/celotool/src/lib/ethstats.ts b/packages/celotool/src/lib/ethstats.ts
@@ -1,6 +1,6 @@
 import { installGenericHelmChart, removeGenericHelmChart } from 'src/lib/helm_deploy'
 import { execCmdWithExitOnFailure } from 'src/lib/utils'
-import { envVar, fetchEnv, isVmBased } from './env-utils'
+import { envVar, fetchEnv } from './env-utils'
 
 const helmChartPath = '../helm-charts/ethstats'
 

diff --git a/packages/celotool/src/lib/helm_deploy.ts b/packages/celotool/src/lib/helm_deploy.ts
@@ -10,7 +10,6 @@ import {
   execCmd,
   execCmdWithExitOnFailure,
   getVerificationPoolRewardsURL,
-  getVerificationPoolSMSURL,
   outputIncludes,
   switchToProjectFromEnv,
 } from './utils'
@@ -522,10 +521,6 @@ async function helmParameters(celoEnv: string) {
 
   return [
     `--set domain.name=${fetchEnv('CLUSTER_DOMAIN_NAME')}`,
-    `--set geth.miner.verificationpool=${fetchEnvOrFallback(
-      'VERIFICATION_POOL_URL',
-      getVerificationPoolSMSURL(celoEnv)
-    )}`,
     `--set geth.verbosity=${fetchEnvOrFallback('GETH_VERBOSITY', '4')}`,
     `--set geth.node.cpu_request=${fetchEnv('GETH_NODE_CPU_REQUEST')}`,
     `--set geth.node.memory_request=${fetchEnv('GETH_NODE_MEMORY_REQUEST')}`,

diff --git a/packages/celotool/src/lib/vm-testnet-utils.ts b/packages/celotool/src/lib/vm-testnet-utils.ts
@@ -50,7 +50,6 @@ const testnetEnvVars: TerraformVars = {
   network_id: envVar.NETWORK_ID,
   tx_node_count: envVar.TX_NODES,
   validator_count: envVar.VALIDATORS,
-  verification_pool_url: envVar.VERIFICATION_POOL_URL,
 }
 
 const testnetNetworkEnvVars: TerraformVars = {

diff --git a/packages/terraform-modules/testnet/modules/tx-node/startup.sh b/packages/terraform-modules/testnet/modules/tx-node/startup.sh
@@ -81,7 +81,6 @@ docker run -v $DATA_DIR:$DATA_DIR -p 8545:8545/tcp -p 8546:8546/tcp --name geth
     --etherbase=$ACCOUNT_ADDRESS \
     --networkid=${network_id} \
     --syncmode=full \
-    --miner.verificationpool=${verification_pool_url} \
     --consoleformat=json \
     --consoleoutput=stdout \
     --verbosity=${geth_verbosity} \

diff --git a/packages/terraform-modules/testnet/modules/tx-node/variables.tf b/packages/terraform-modules/testnet/modules/tx-node/variables.tf
@@ -82,8 +82,3 @@ variable tx_node_count {
   type        = number
   description = "Number of tx-nodes to create"
 }
-
-variable verification_pool_url {
-  type        = string
-  description = "URL of the verification pool"
-}
diff --git a/packages/terraform-modules/testnet/modules/validator/main.tf b/packages/terraform-modules/testnet/modules/validator/main.tf
@@ -67,8 +67,7 @@ resource "google_compute_instance" "validator" {
       max_peers : (var.validator_count + var.tx_node_count) * 2,
       network_id : var.network_id,
       rid : count.index,
-      validator_name : "${local.name_prefix}-${count.index}",
-      verification_pool_url : var.verification_pool_url
+      validator_name : "${local.name_prefix}-${count.index}"
     }
   )
 

diff --git a/packages/terraform-modules/testnet/modules/validator/startup.sh b/packages/terraform-modules/testnet/modules/validator/startup.sh
@@ -109,7 +109,6 @@ docker run -v $DATA_DIR:$DATA_DIR --name geth --net=host --entrypoint /bin/sh -d
       --etherbase=$ACCOUNT_ADDRESS \
       --networkid=${network_id} \
       --syncmode=full \
-      --miner.verificationpool=${verification_pool_url} \
       --consoleformat=json \
       --consoleoutput=stdout \
       --verbosity=${geth_verbosity} \

diff --git a/packages/terraform-modules/testnet/modules/validator/variables.tf b/packages/terraform-modules/testnet/modules/validator/variables.tf
@@ -92,8 +92,3 @@ variable validator_count {
   type        = number
   description = "Number of validators to create"
 }
-
-variable verification_pool_url {
-  type        = string
-  description = "URL of the verification pool"
-}
diff --git a/packages/terraform-modules/testnet/variables.tf b/packages/terraform-modules/testnet/variables.tf
@@ -107,8 +107,3 @@ variable validator_count {
   type        = number
   description = "Number of validators to create"
 }
-
-variable verification_pool_url {
-  type        = string
-  description = "URL of the verification pool"
-}