Skip to content

Commit

Permalink
feat(node): migrate to go claimer
Browse files Browse the repository at this point in the history
  • Loading branch information
mpolitzer committed Oct 29, 2024
1 parent 50ebed5 commit 580f73e
Show file tree
Hide file tree
Showing 32 changed files with 185 additions and 8,145 deletions.
22 changes: 1 addition & 21 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ else
PREFIX ?= /usr
endif

# Rust artifacts
CLAIMER := cmd/authority-claimer/target/$(BUILD_TYPE)/cartesi-rollups-authority-claimer
RUST_ARTIFACTS := $(CLAIMER)

# Go artifacts
GO_ARTIFACTS := cartesi-rollups-node cartesi-rollups-cli cartesi-rollups-evm-reader cartesi-rollups-advancer cartesi-rollups-validator cartesi-rollups-claimer

Expand Down Expand Up @@ -61,9 +57,7 @@ all: build
# =============================================================================
# Build
# =============================================================================
build: build-go build-rust ## Build all artifacts

build-rust: $(RUST_ARTIFACTS) ## Build rust artifacts (claimer)
build: build-go ## Build all artifacts

build-go: $(GO_ARTIFACTS) ## Build Go artifacts (node, cli, evm-reader)

Expand All @@ -89,11 +83,6 @@ $(GO_ARTIFACTS):
@echo "Building Go artifact $@"
go build $(GO_BUILD_PARAMS) ./cmd/$@

$(CLAIMER): | $(ROLLUPS_CONTRACTS_ABI_BASEDIR)
@echo "Building Rust artifact $@"
@cd cmd/authority-claimer && cargo build $(CARGO_BUILD_PARAMS)
@cp cmd/authority-claimer/target/release/cartesi-rollups-authority-claimer .

tidy-go:
@go mod tidy

Expand Down Expand Up @@ -131,11 +120,6 @@ clean-go: ## Clean Go artifacts
@go clean -i -r -cache
@rm -f $(GO_ARTIFACTS)

clean-rust: ## Clean Rust artifacts
@echo "Cleaning Rust artifacts"
@cd cmd/authority-claimer && cargo clean
@rm -f cartesi-rollups-authority-claimer

clean-contracts: ## Clean contract artifacts
@echo "Cleaning contract artifacts"
@cd rollups-contracts && rm -rf artifacts cache export/artifacts node_modules src && git checkout .
Expand All @@ -162,10 +146,6 @@ unit-test-go: deployment.json ## Execute go unit tests
@go clean -testcache
@go test -p 1 $(GO_BUILD_PARAMS) $(GO_TEST_PACKAGES)

unit-test-rust: ## Execute unit tests
@echo "Running rust unit tests"
@cd cmd/authority-claimer && cargo test

e2e-test: ## Execute e2e tests
@echo "Running end-to-end tests"
@go test -count=1 ./test --tags=endtoendtests
Expand Down
1 change: 0 additions & 1 deletion cmd/authority-claimer/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions cmd/authority-claimer/.rustfmt.toml

This file was deleted.

Loading

0 comments on commit 580f73e

Please sign in to comment.