Skip to content

Commit 084acdb

Browse files
authored
[refactor] Convert hyphen to underscore in the directory tree (#524)
* Move price-service to price_service * Update references to price-service * Rename target-chains to target_chains * Update references to target-chains * Rename tilt-devnet to tilt_devnet * Update references to tilt-devnet * Rename wormhole-attester to wormhole_attester * Update references to wormhole-attester * Rename multisig-wh-message-builder * Update references to wh-msg-bldr * Fix dockerfile issue * Rename remove-executor to remote_executor * Update references to remote-executor * Rename xc-governance-sdk-js * Update references to the governance sdk * Move docker-images to docker_images * Update references to docker-images
1 parent 58f3ddc commit 084acdb

File tree

382 files changed

+111
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

382 files changed

+111
-111
lines changed

.github/workflows/ethereum-contract.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
on:
22
pull_request:
33
paths:
4-
- target-chains/ethereum/**
5-
- governance/xc-governance-sdk-js/**
4+
- target_chains/ethereum/**
5+
- governance/xc_governance_sdk_js/**
66
push:
77
branches:
88
- main
99
paths:
10-
- target-chains/ethereum/**
11-
- governance/xc-governance-sdk-js/**
10+
- target_chains/ethereum/**
11+
- governance/xc_governance_sdk_js/**
1212

1313
name: Ethereum Contract
1414

@@ -18,13 +18,13 @@ jobs:
1818
runs-on: ubuntu-latest
1919
defaults:
2020
run:
21-
working-directory: target-chains/ethereum/
21+
working-directory: target_chains/ethereum/
2222
steps:
2323
- uses: actions/checkout@v3
2424

2525
- name: Install XC-governance sdk dependencies
2626
run: npm ci
27-
working-directory: governance/xc-governance-sdk-js
27+
working-directory: governance/xc_governance_sdk_js
2828

2929
- name: Install contract npm dependencies
3030
run: npm ci

.github/workflows/price-service-image-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
env:
3838
AWS_REGION: us-east-1
3939
- run: |
40-
DOCKER_BUILDKIT=1 docker build -f tilt-devnet/docker-images/Dockerfile.wasm -o type=local,dest=. .
41-
DOCKER_BUILDKIT=1 docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f price-service/Dockerfile.price_service .
40+
DOCKER_BUILDKIT=1 docker build -f tilt_devnet/docker_images/Dockerfile.wasm -o type=local,dest=. .
41+
DOCKER_BUILDKIT=1 docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f price_service/Dockerfile.price_service .
4242
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
4343
env:
4444
ECR_REGISTRY: public.ecr.aws

.github/workflows/pyth-cosmwasm-contract.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: Pyth CosmWasm Contract
33
on:
44
pull_request:
55
paths:
6-
- target-chains/cosmwasm/**
6+
- target_chains/cosmwasm/**
77
- third_party/pyth/p2w-sdk/rust/**
88
push:
99
branches:
1010
- main
1111
paths:
12-
- target-chains/cosmwasm/**
12+
- target_chains/cosmwasm/**
1313
- third_party/pyth/p2w-sdk/rust/**
1414

1515
env:
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
defaults:
2222
run:
23-
working-directory: target-chains/cosmwasm/contracts/pyth
23+
working-directory: target_chains/cosmwasm/contracts/pyth
2424
steps:
2525
- uses: actions/checkout@v2
2626
- name: Build

.github/workflows/remote-executor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Check Remote Executor
22

33
on:
44
pull_request:
5-
paths: [governance/remote-executor/**]
5+
paths: [governance/remote_executor/**]
66
push:
77
branches: [main]
8-
paths: [governance/remote-executor/**]
8+
paths: [governance/remote_executor/**]
99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
@@ -22,4 +22,4 @@ jobs:
2222
sh -c "$(curl -sSfL https://release.solana.com/stable/install)"
2323
echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
2424
- name: Run executor tests
25-
run: cargo test-bpf --manifest-path ./governance/remote-executor/Cargo.toml
25+
run: cargo test-bpf --manifest-path ./governance/remote_executor/Cargo.toml

.pre-commit-config.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,43 +21,43 @@ repos:
2121
- id: cargo-fmt-remote-executor
2222
name: Cargo format for remote executor
2323
language: "rust"
24-
entry: cargo +nightly fmt --manifest-path ./governance/remote-executor/Cargo.toml --all -- --config-path rustfmt.toml
24+
entry: cargo +nightly fmt --manifest-path ./governance/remote_executor/Cargo.toml --all -- --config-path rustfmt.toml
2525
pass_filenames: false
26-
files: governance/remote-executor
26+
files: governance/remote_executor
2727
- id: cargo-clippy-remote-executor
2828
name: Cargo clippy for remote executor
2929
language: "rust"
30-
entry: cargo +nightly clippy --manifest-path ./governance/remote-executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
30+
entry: cargo +nightly clippy --manifest-path ./governance/remote_executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
3131
pass_filenames: false
32-
files: governance/remote-executor
32+
files: governance/remote_executor
3333
# Hooks for the attester
3434
- id: cargo-fmt-attester
3535
name: Cargo format for attester
3636
language: "rust"
37-
entry: cargo +nightly fmt --manifest-path ./wormhole-attester/Cargo.toml --all -- --config-path rustfmt.toml
37+
entry: cargo +nightly fmt --manifest-path ./wormhole_attester/Cargo.toml --all -- --config-path rustfmt.toml
3838
pass_filenames: false
39-
files: wormhole-attester
39+
files: wormhole_attester
4040
- id: cargo-clippy-attester
4141
name: Cargo clippy for attester
4242
language: "rust"
4343
entry: |
4444
bash -c 'EMITTER_ADDRESS=0 BRIDGE_ADDRESS=0 cargo +nightly clippy --manifest-path \
45-
./wormhole-attester/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings'
45+
./wormhole_attester/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings'
4646
pass_filenames: false
47-
files: wormhole-attester
47+
files: wormhole_attester
4848
# Hooks for cosmwasm contract
4949
- id: cargo-fmt-cosmwasm
5050
name: Cargo format for cosmwasm contract
5151
language: "rust"
52-
entry: cargo +nightly fmt --manifest-path ./target-chains/cosmwasm/Cargo.toml --all -- --config-path rustfmt.toml
52+
entry: cargo +nightly fmt --manifest-path ./target_chains/cosmwasm/Cargo.toml --all -- --config-path rustfmt.toml
5353
pass_filenames: false
54-
files: target-chains/cosmwasm
54+
files: target_chains/cosmwasm
5555
- id: cargo-clippy-cosmwasm
5656
name: Cargo clippy for cosmwasm contract
5757
language: "rust"
58-
entry: cargo +nightly clippy --manifest-path ./target-chains/cosmwasm/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
58+
entry: cargo +nightly clippy --manifest-path ./target_chains/cosmwasm/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
5959
pass_filenames: false
60-
files: target-chains/cosmwasm
60+
files: target_chains/cosmwasm
6161
# Hooks for p2w-sdk/rust
6262
- id: cargo-fmt-p2w-sdk
6363
name: Cargo format for p2w-sdk

README.md

Lines changed: 3 additions & 3 deletions

Tiltfile

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ def k8s_yaml_with_ns(objects):
6666

6767
local_resource(
6868
name = "wasm-gen",
69-
cmd = "tilt docker build -- -f tilt-devnet/docker-images/Dockerfile.wasm -o type=local,dest=. .",
69+
cmd = "tilt docker build -- -f tilt_devnet/docker_images/Dockerfile.wasm -o type=local,dest=. .",
7070
env = {"DOCKER_BUILDKIT": "1"},
71-
deps = "./wormhole-attester",
71+
deps = "./wormhole_attester",
7272
labels = ["wasm"],
7373
allow_parallel=True,
7474
trigger_mode = trigger_mode,
7575
)
7676

7777
def build_node_yaml():
78-
node_yaml = read_yaml_stream("tilt-devnet/k8s/node.yaml")
78+
node_yaml = read_yaml_stream("tilt_devnet/k8s/node.yaml")
7979

8080
for obj in node_yaml:
8181
if obj["kind"] == "StatefulSet" and obj["metadata"]["name"] == "guardian":
@@ -103,7 +103,7 @@ k8s_resource(
103103
)
104104

105105
# spy
106-
k8s_yaml_with_ns("tilt-devnet/k8s/spy.yaml")
106+
k8s_yaml_with_ns("tilt_devnet/k8s/spy.yaml")
107107

108108
k8s_resource(
109109
"spy",
@@ -121,20 +121,20 @@ k8s_resource(
121121
docker_build(
122122
ref = "bridge-client",
123123
context = ".",
124-
dockerfile = "tilt-devnet/docker-images/Dockerfile.client",
124+
dockerfile = "tilt_devnet/docker_images/Dockerfile.client",
125125
)
126126

127127
# solana smart contract
128128

129129
docker_build(
130130
ref = "solana-contract",
131131
context = ".",
132-
dockerfile = "tilt-devnet/docker-images/Dockerfile.solana",
132+
dockerfile = "tilt_devnet/docker_images/Dockerfile.solana",
133133
)
134134

135135
# solana local devnet
136136

137-
k8s_yaml_with_ns("tilt-devnet/k8s/solana-devnet.yaml")
137+
k8s_yaml_with_ns("tilt_devnet/k8s/solana-devnet.yaml")
138138

139139
k8s_resource(
140140
"solana-devnet",
@@ -152,7 +152,7 @@ k8s_resource(
152152
docker_build(
153153
ref = "eth-node",
154154
context = "./",
155-
dockerfile = "tilt-devnet/docker-images/Dockerfile.ethereum",
155+
dockerfile = "tilt_devnet/docker_images/Dockerfile.ethereum",
156156

157157
# sync external scripts for incremental development
158158
# (everything else needs to be restarted from scratch for determinism)
@@ -170,7 +170,7 @@ docker_build(
170170
context = ".",
171171
dockerfile = "third_party/pyth/Dockerfile.pyth",
172172
)
173-
k8s_yaml_with_ns("./tilt-devnet/k8s/pyth.yaml")
173+
k8s_yaml_with_ns("./tilt_devnet/k8s/pyth.yaml")
174174

175175
k8s_resource(
176176
"pyth",
@@ -186,7 +186,7 @@ docker_build(
186186
dockerfile = "./third_party/pyth/Dockerfile.p2w-attest",
187187
)
188188

189-
k8s_yaml_with_ns("tilt-devnet/k8s/p2w-attest.yaml")
189+
k8s_yaml_with_ns("tilt_devnet/k8s/p2w-attest.yaml")
190190
k8s_resource(
191191
"p2w-attest",
192192
resource_deps = ["solana-devnet", "pyth", "guardian"],
@@ -203,7 +203,7 @@ docker_build(
203203
dockerfile = "./third_party/pyth/Dockerfile.check-attestations",
204204
)
205205

206-
k8s_yaml_with_ns("tilt-devnet/k8s/check-attestations.yaml")
206+
k8s_yaml_with_ns("tilt_devnet/k8s/check-attestations.yaml")
207207
k8s_resource(
208208
"check-attestations",
209209
resource_deps = ["pyth-price-service", "pyth", "p2w-attest"],
@@ -217,7 +217,7 @@ docker_build(
217217
context = ".",
218218
dockerfile = "third_party/pyth/p2w-relay/Dockerfile.pyth_relay",
219219
)
220-
k8s_yaml_with_ns("tilt-devnet/k8s/p2w-terra-relay.yaml")
220+
k8s_yaml_with_ns("tilt_devnet/k8s/p2w-terra-relay.yaml")
221221
k8s_resource(
222222
"p2w-terra-relay",
223223
resource_deps = ["pyth", "p2w-attest", "spy", "terra-terrad", "wasm-gen"],
@@ -227,7 +227,7 @@ k8s_resource(
227227
labels = ["pyth"]
228228
)
229229

230-
k8s_yaml_with_ns("tilt-devnet/k8s/p2w-evm-relay.yaml")
230+
k8s_yaml_with_ns("tilt_devnet/k8s/p2w-evm-relay.yaml")
231231
k8s_resource(
232232
"p2w-evm-relay",
233233
resource_deps = ["pyth", "p2w-attest", "spy", "eth-devnet", "wasm-gen"],
@@ -241,9 +241,9 @@ k8s_resource(
241241
docker_build(
242242
ref = "pyth-price-service",
243243
context = ".",
244-
dockerfile = "price-service/Dockerfile.price_service",
244+
dockerfile = "price_service/Dockerfile.price_service",
245245
)
246-
k8s_yaml_with_ns("tilt-devnet/k8s/pyth-price-service.yaml")
246+
k8s_yaml_with_ns("tilt_devnet/k8s/pyth-price-service.yaml")
247247
k8s_resource(
248248
"pyth-price-service",
249249
resource_deps = ["pyth", "p2w-attest", "spy", "eth-devnet", "wasm-gen"],
@@ -253,7 +253,7 @@ k8s_resource(
253253
labels = ["pyth"]
254254
)
255255

256-
k8s_yaml_with_ns("tilt-devnet/k8s/eth-devnet.yaml")
256+
k8s_yaml_with_ns("tilt_devnet/k8s/eth-devnet.yaml")
257257

258258
k8s_resource(
259259
"eth-devnet",
@@ -278,17 +278,17 @@ k8s_resource(
278278

279279
docker_build(
280280
ref = "terra-image",
281-
context = "./target-chains/cosmwasm/devnet",
282-
dockerfile = "./target-chains/cosmwasm/devnet/Dockerfile",
281+
context = "./target_chains/cosmwasm/devnet",
282+
dockerfile = "./target_chains/cosmwasm/devnet/Dockerfile",
283283
)
284284

285285
docker_build(
286286
ref = "cosmwasm-contracts",
287287
context = ".",
288-
dockerfile = "tilt-devnet/docker-images/Dockerfile.cosmwasm",
288+
dockerfile = "tilt_devnet/docker_images/Dockerfile.cosmwasm",
289289
)
290290

291-
k8s_yaml_with_ns("tilt-devnet/k8s/terra-devnet.yaml")
291+
k8s_yaml_with_ns("tilt_devnet/k8s/terra-devnet.yaml")
292292

293293
k8s_resource(
294294
"terra-terrad",
@@ -317,10 +317,10 @@ k8s_resource(
317317
docker_build(
318318
ref = "prometheus",
319319
context = ".",
320-
dockerfile = "tilt-devnet/docker-images/Dockerfile.prometheus",
320+
dockerfile = "tilt_devnet/docker_images/Dockerfile.prometheus",
321321
)
322322

323-
k8s_yaml_with_ns("tilt-devnet/k8s/prometheus.yaml")
323+
k8s_yaml_with_ns("tilt_devnet/k8s/prometheus.yaml")
324324

325325
k8s_resource(
326326
"prometheus",
@@ -332,10 +332,10 @@ k8s_resource(
332332
docker_build(
333333
ref = "multisig",
334334
context = ".",
335-
dockerfile = "tilt-devnet/docker-images/Dockerfile.multisig",
335+
dockerfile = "tilt_devnet/docker_images/Dockerfile.multisig",
336336
)
337337

338-
k8s_yaml_with_ns("tilt-devnet/k8s/multisig.yaml")
338+
k8s_yaml_with_ns("tilt_devnet/k8s/multisig.yaml")
339339

340340
k8s_resource(
341341
"multisig",

0 commit comments

Comments
 (0)