From 73eb4749fc00dac76dac97675511c950c5a0603b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wawrzyniec=20=27Wawrzek=27=20Niewodnicza=C5=84ski?= Date: Thu, 9 May 2024 19:09:10 +0100 Subject: [PATCH] Adjust config pahs in other places - docker-compose.yml - integration-tests - deposit script - comments in the code --- core/config/config.go | 2 +- docker-compose.yml | 6 +++--- scripts/deposit-into-mocktoken-strategy.sh | 2 +- tests/integration/integration_test.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/config/config.go b/core/config/config.go index 70f54548..dab286c6 100644 --- a/core/config/config.go +++ b/core/config/config.go @@ -21,7 +21,7 @@ import ( ) // Config contains all of the configuration information for a credible squaring aggregators and challengers. -// Operators use a separate config. (see config-files/operator.anvil.yaml) +// Operators use a separate config. (see config-files/31337/operator.anvil.yaml) type Config struct { EcdsaPrivateKey *ecdsa.PrivateKey BlsPrivateKey *bls.PrivateKey diff --git a/docker-compose.yml b/docker-compose.yml index aebbc4f1..8b9f87c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: working_dir: /incredible-squaring command: - --config - - config-files/aggregator-docker-compose.yaml + - config-files/31337/aggregator-docker-compose.yaml - --credible-squaring-deployment - contracts/script/output/31337/credible_squaring_avs_deployment_output.json - --ecdsa-private-key @@ -52,7 +52,7 @@ services: volumes: - ./:/incredible-squaring/ working_dir: /incredible-squaring - command: --config config-files/operator-docker-compose.anvil.yaml + command: --config config-files/31337/operator-docker-compose.anvil.yaml networks: - incredible-squaring-network @@ -65,7 +65,7 @@ services: # volumes: # - ./:/incredible-squaring/ # working_dir: /incredible-squaring - # command: --config config-files/operator-docker-compose.anvil.yaml --credible-squaring-deployment contracts/script/output/31337/credible_squaring_avs_deployment_output.json --ecdsa-private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d --bls-private-key 2 + # command: --config config-files/31337/operator-docker-compose.anvil.yaml --credible-squaring-deployment contracts/script/output/31337/credible_squaring_avs_deployment_output.json --ecdsa-private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d --bls-private-key 2 # networks: # - incredible-squaring-network diff --git a/scripts/deposit-into-mocktoken-strategy.sh b/scripts/deposit-into-mocktoken-strategy.sh index f8910e1a..12e80c54 100755 --- a/scripts/deposit-into-mocktoken-strategy.sh +++ b/scripts/deposit-into-mocktoken-strategy.sh @@ -14,4 +14,4 @@ CHAINID=$(cast chain-id) DEPLOYMENT_OUTPUT_FILE=./contracts/script/output/${CHAINID}/credible_squaring_avs_deployment_output.json STRATEGY_ADDRESS=$(jq -r '.addresses.erc20MockStrategy' $DEPLOYMENT_OUTPUT_FILE) -go run cli/main.go --config config-files/operator.anvil.yaml deposit-into-strategy --strategy-addr ${STRATEGY_ADDRESS} --amount 100 +go run cli/main.go --config config-files/${CHAINID}/operator.anvil.yaml deposit-into-strategy --strategy-addr ${STRATEGY_ADDRESS} --amount 100 diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 963cc173..aac55eb6 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -47,7 +47,7 @@ func TestIntegration(t *testing.T) { /* Prepare the config file for aggregator */ var aggConfigRaw config.ConfigRaw - aggConfigFilePath := "../../config-files/aggregator.yaml" + aggConfigFilePath := "../../config-files/31337/aggregator.yaml" sdkutils.ReadYamlConfig(aggConfigFilePath, &aggConfigRaw) aggConfigRaw.EthRpcUrl = "http://" + anvilEndpoint aggConfigRaw.EthWsUrl = "ws://" + anvilEndpoint @@ -114,7 +114,7 @@ func TestIntegration(t *testing.T) { /* Prepare the config file for operator */ nodeConfig := types.NodeConfig{} - nodeConfigFilePath := "../../config-files/operator.anvil.yaml" + nodeConfigFilePath := "../../config-files/31337/operator.anvil.yaml" err = sdkutils.ReadYamlConfig(nodeConfigFilePath, &nodeConfig) if err != nil { t.Fatalf("Failed to read yaml config: %s", err.Error())