Skip to content

Commit

Permalink
fix(ci): remove unused ADDRESS vars & export private key vars (#3520)
Browse files Browse the repository at this point in the history
  • Loading branch information
spypsy authored Dec 1, 2023
1 parent 640aabc commit d889359
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 19 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,8 @@ jobs:
export TF_VAR_BOOTNODE_2_PEER_ID=$BOOTNODE_2_PEER_ID
export TF_VAR_BOOTNODE_1_PRIVATE_KEY=$BOOTNODE_1_PRIVATE_KEY
export TF_VAR_BOOTNODE_2_PRIVATE_KEY=$BOOTNODE_2_PRIVATE_KEY
export TF_VAR_SEQ_1_PUBLISHER_PRIVATE_KEY=$SEQ_1_PUBLISHER_PRIVATE_KEY
export TF_VAR_SEQ_2_PUBLISHER_PRIVATE_KEY=$SEQ_2_PUBLISHER_PRIVATE_KEY
deploy_terraform p2p-bootstrap yarn-project/p2p-bootstrap/terraform
deploy_terraform aztec-node yarn-project/aztec-node/terraform
deploy_terraform aztec-faucet yarn-project/aztec-faucet/terraform
Expand Down
22 changes: 4 additions & 18 deletions yarn-project/aztec-node/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,6 @@ variable "API_KEY" {
type = string
}

variable "CONTRACT_DEPLOYMENT_EMITTER_ADDRESS" {
type = string
}

variable "ROLLUP_CONTRACT_ADDRESS" {
type = string
}

variable "INBOX_CONTRACT_ADDRESS" {
type = string
}

variable "REGISTRY_CONTRACT_ADDRESS" {
type = string
}

variable "SEQ_1_PUBLISHER_PRIVATE_KEY" {
type = string
}
Expand Down Expand Up @@ -54,11 +38,13 @@ variable "NODE_TCP_PORT" {
}

variable "NODE_1_PRIVATE_KEY" {
type = string
type = string
default = ""
}

variable "NODE_2_PRIVATE_KEY" {
type = string
type = string
default = ""
}

variable "DOCKERHUB_ACCOUNT" {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/p2p/src/service/libp2p_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const INITIAL_PEER_REFRESH_INTERVAL = 20000;
* @returns The peer ID.
*/
export async function createLibP2PPeerId(privateKey?: string) {
if (!privateKey) {
if (!privateKey?.length) {
return await createSecp256k1PeerId();
}
const base64 = Buffer.from(privateKey, 'hex').toString('base64');
Expand Down

0 comments on commit d889359

Please sign in to comment.