Skip to content

Commit 77e114d

Browse files
Merge pull request #1693 from o1-labs/rp/unused
Move testing into the tools directory
2 parents 62fd29f + e58ef99 commit 77e114d

File tree

106 files changed

+70
-68
lines changed

Some content is hidden

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

106 files changed

+70
-68
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ members = [
1212
"node/common",
1313
"node/invariants",
1414
"node/native",
15-
"node/testing",
15+
"tools/testing",
1616
"node/web",
1717
"p2p",
1818
"p2p/libp2p-rpc-behaviour",
@@ -142,7 +142,7 @@ mina-node-account = { path = "node/account" }
142142
mina-node-common = { path = "node/common" }
143143
mina-node-invariants = { path = "node/invariants" }
144144
mina-node-native = { path = "node/native" }
145-
mina-node-testing = { path = "node/testing" }
145+
mina-node-testing = { path = "tools/testing" }
146146
mina-p2p-messages = { path = "mina-p2p-messages" }
147147
mina-poseidon = { git = "https://github.com/o1-labs/proof-systems", tag = "0.2.0" }
148148
mina-signer = { git = "https://github.com/o1-labs/proof-systems", tag = "0.2.0" }

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ docker-build-bootstrap-sandbox: ## Build bootstrap sandbox Docker image
368368
.PHONY: docker-build-debugger
369369
docker-build-debugger: ## Build debugger Docker image
370370
docker build -t $(DOCKER_ORG)/mina-rust-debugger:$(GIT_COMMIT) \
371-
-f node/testing/docker/Dockerfile.debugger node/testing/docker/
371+
-f tools/testing/docker/Dockerfile.debugger tools/testing/docker/
372372

373373
.PHONY: docker-build-frontend
374374
docker-build-frontend: ## Build frontend Docker image
@@ -395,12 +395,12 @@ docker-build-fuzzing: ## Build fuzzing Docker image
395395
.PHONY: docker-build-light
396396
docker-build-light: ## Build light Docker image
397397
docker build -t $(DOCKER_ORG)/mina-rust-light:$(GIT_COMMIT) \
398-
-f node/testing/docker/Dockerfile.light node/testing/docker/
398+
-f tools/testing/docker/Dockerfile.light tools/testing/docker/
399399

400400
.PHONY: docker-build-light-focal
401401
docker-build-light-focal: ## Build light focal Docker image
402402
docker build -t $(DOCKER_ORG)/mina-rust-light-focal:$(GIT_COMMIT) \
403-
-f node/testing/docker/Dockerfile.light.focal node/testing/docker/
403+
-f tools/testing/docker/Dockerfile.light.focal tools/testing/docker/
404404

405405
.PHONY: docker-build-mina
406406
docker-build-mina: ## Build main Mina Docker image
@@ -419,12 +419,12 @@ docker-build-mina: ## Build main Mina Docker image
419419
.PHONY: docker-build-mina-testing
420420
docker-build-mina-testing: ## Build Mina testing Docker image
421421
docker build -t $(DOCKER_ORG)/mina-rust-testing:$(GIT_COMMIT) \
422-
-f node/testing/docker/Dockerfile.mina node/testing/docker/
422+
-f tools/testing/docker/Dockerfile.mina tools/testing/docker/
423423

424424
.PHONY: docker-build-test
425425
docker-build-test: ## Build test Docker image
426426
docker build -t $(DOCKER_ORG)/mina-rust-test:$(GIT_COMMIT) \
427-
-f node/testing/docker/Dockerfile.test node/testing/docker/
427+
-f tools/testing/docker/Dockerfile.test tools/testing/docker/
428428

429429
# Docker push targets
430430

README.md

Lines changed: 1 addition & 1 deletion

node/common/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,7 @@ google-cloud-storage = { workspace = true }
4848
google-cloud-auth = { workspace = true }
4949

5050
[features]
51+
# won't compile without this on
52+
default = ["p2p-webrtc"]
5153
p2p-webrtc = ["node/p2p-webrtc"]
5254
p2p-libp2p = ["node/p2p-libp2p"]

node/testing/docker/README.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

p2p/testing.md

Lines changed: 31 additions & 31 deletions

p2p/testing/README.md

Lines changed: 1 addition & 1 deletion
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)