Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tooling, Code Health] refactor: split Makefile into multiple files #816

Merged
merged 18 commits into from
Sep 16, 2024

Conversation

bryanchriswhite
Copy link
Contributor

@bryanchriswhite bryanchriswhite commented Sep 11, 2024

Summary

The Makefile has gotten quite large (1185 LoC). This PR splits the makefile into multiple files, focusing on large groups of targets and groups related to on-chain state or local/devnets:

  • warnings.mk
  • todos.mk
  • checks.mk
  • tests.mk
  • localnet.mk
  • testnet.mk
  • params.mk
  • applications.mk
  • suppliers.mk
  • gateways.mk
  • session.mk
  • claims.mk

Issue

Type of change

Select one or more from the following:

Testing

  • Documentation: make docusaurus_start; only needed if you make doc changes
  • Unit Tests: make go_develop_and_test
  • LocalNet E2E Tests: make test_e2e
  • DevNet E2E Tests: Add the devnet-test-e2e label to the PR.

Sanity Checklist

  • I have tested my changes using the available tooling
  • I have commented my code
  • I have performed a self-review of my own code; both comments & source code
  • I create and reference any new tickets, if applicable
  • I have left TODOs throughout the codebase, if applicable

@bryanchriswhite bryanchriswhite added code health Cleans up some code tooling Tooling - CLI, scripts, helpers, off-chain, etc... labels Sep 11, 2024
@bryanchriswhite bryanchriswhite self-assigned this Sep 11, 2024
Copy link

The CI will now also run the e2e tests on devnet, which increases the time it takes to complete all CI checks.

You may need to run make trigger_ci to submit an empty commit that'll trigger the tests.

GCP workloads (requires changing the namespace to 816)
Grafana network dashboard for devnet-issue-816

@github-actions github-actions bot added devnet push-image CI related - pushes images to ghcr.io labels Sep 11, 2024
@bryanchriswhite bryanchriswhite force-pushed the issues/799/refactor/makefiles branch from ee035ab to 485156e Compare September 11, 2024 10:03
makefiles/checks.mk Outdated Show resolved Hide resolved
@bryanchriswhite bryanchriswhite marked this pull request as ready for review September 12, 2024 08:24
Copy link
Member

@Olshansk Olshansk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, ty!

@@ -132,167 +132,6 @@ list: ## List all make targets
help: ## Prints all the targets in all the Makefiles
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you confirm this still works?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yessir! 🫡

makefiles/localnet.mk Outdated Show resolved Hide resolved
makefiles/localnet.mk Outdated Show resolved Hide resolved
Copy link
Member

@Olshansk Olshansk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, ty!

Copy link
Member

@Olshansk Olshansk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, ty!

@bryanchriswhite bryanchriswhite linked an issue Sep 16, 2024 that may be closed by this pull request
6 tasks
@bryanchriswhite bryanchriswhite changed the base branch from issues/799/merge/supplier-stake_x_make-targets to main September 16, 2024 08:02
@bryanchriswhite
Copy link
Contributor Author

Merging despite CI failures.

  1. CI passed as of 335e68b
  2. Subsequent commits only "merge with main", reverting commits that were merged from another branch into this branches original base (the PR base has since been updated to main).
  3. This branch only modifies the makefiles
    image

@bryanchriswhite bryanchriswhite merged commit ac3b324 into main Sep 16, 2024
5 of 9 checks passed
@bryanchriswhite bryanchriswhite deleted the issues/799/refactor/makefiles branch September 16, 2024 08:17
bryanchriswhite added a commit that referenced this pull request Sep 16, 2024
…ke-transfer

* pokt/main:
  [Tooling, Code Health] refactor: split Makefile into multiple files (#816)
  [Tooling] fix and add makefile targets (#814)
  [Docs] Add a debugging tip: using transaction hashes (#786)
  [Refactor] Replace embedded Service with ServiceId (#802)
  [Session,Service] Ensure SessionHeader and Service basic validation. (#782)
  [Tokenomics] Preparation for Global Mint Reimbursement Request (#755)
  [Quick PR][LocalNet] Turn off minimum-gas-prices (#805)
  [GATEWAY POC] A couple helpers to help deploy a PATH gateway (#801)
  [Documentation] Cosmovisor  (#768)
  [CI] Add cosmovisor to container images (#796)
  Use a descriptive error if service ID is not found (#787)
  [SessionManager] Implement off-chain proof params usage (#765)
  [SDK] Update shannon sdk dependency (#800)
  [E2E Test] Remove redundant logging (#798)
bryanchriswhite added a commit that referenced this pull request Sep 16, 2024
…actor/transfer-msg_period-param

* issues/657/feat/app-stake-transfer:
  [Tooling, Code Health] refactor: split Makefile into multiple files (#816)
  [Tooling] fix and add makefile targets (#814)
  [Docs] Add a debugging tip: using transaction hashes (#786)
  [Refactor] Replace embedded Service with ServiceId (#802)
  [Session,Service] Ensure SessionHeader and Service basic validation. (#782)
  [Tokenomics] Preparation for Global Mint Reimbursement Request (#755)
  [Quick PR][LocalNet] Turn off minimum-gas-prices (#805)
  [GATEWAY POC] A couple helpers to help deploy a PATH gateway (#801)
  [Documentation] Cosmovisor  (#768)
  [CI] Add cosmovisor to container images (#796)
  Use a descriptive error if service ID is not found (#787)
  [SessionManager] Implement off-chain proof params usage (#765)
  [SDK] Update shannon sdk dependency (#800)
  [E2E Test] Remove redundant logging (#798)
bryanchriswhite added a commit that referenced this pull request Sep 16, 2024
…ues/657/chore/app-transfer-period

* issues/657/refactor/transfer-msg_period-param:
  [Tooling, Code Health] refactor: split Makefile into multiple files (#816)
  [Tooling] fix and add makefile targets (#814)
  [Docs] Add a debugging tip: using transaction hashes (#786)
  [Refactor] Replace embedded Service with ServiceId (#802)
  [Session,Service] Ensure SessionHeader and Service basic validation. (#782)
  [Tokenomics] Preparation for Global Mint Reimbursement Request (#755)
  [Quick PR][LocalNet] Turn off minimum-gas-prices (#805)
  [GATEWAY POC] A couple helpers to help deploy a PATH gateway (#801)
  [Documentation] Cosmovisor  (#768)
  [CI] Add cosmovisor to container images (#796)
  Use a descriptive error if service ID is not found (#787)
  [SessionManager] Implement off-chain proof params usage (#765)
  [SDK] Update shannon sdk dependency (#800)
  [E2E Test] Remove redundant logging (#798)
bryanchriswhite added a commit that referenced this pull request Sep 19, 2024
…99/e2e/param-helpers

* issues/799/e2e/idempotent-stake-supplier:
  chore: add comment
  chore: sync shared module default params
  fix: failing E2E test
  [Supplier] Initial slashing implementation (#795)
  [Container image] Change base image for release (#829)
  [Proof] Prevent proof submission when not required (#822)
  chore: rename paramsAnyMap type to mitigate variable name shadowing
  [Tooling, Code Health] refactor: split Makefile into multiple files (#816)
  [Tooling] fix and add makefile targets (#814)
  [Docs] Add a debugging tip: using transaction hashes (#786)
bryanchriswhite added a commit that referenced this pull request Sep 19, 2024
…lier-stake-events

* issues/799/e2e/param-helpers:
  chore: review feedback improvements
  chore: add comment
  chore: sync shared module default params
  fix: failing E2E test
  [Supplier] Initial slashing implementation (#795)
  [Container image] Change base image for release (#829)
  [Proof] Prevent proof submission when not required (#822)
  chore: rename paramsAnyMap type to mitigate variable name shadowing
  [Tooling, Code Health] refactor: split Makefile into multiple files (#816)
  [Tooling] fix and add makefile targets (#814)
  [Docs] Add a debugging tip: using transaction hashes (#786)
bryanchriswhite added a commit that referenced this pull request Sep 19, 2024
…tests/params

* issues/799/feat/supplier-stake-events:
  chore: review feedback improvements
  chore: add comment
  chore: sync shared module default params
  fix: failing E2E test
  [Supplier] Initial slashing implementation (#795)
  [Container image] Change base image for release (#829)
  [Proof] Prevent proof submission when not required (#822)
  chore: rename paramsAnyMap type to mitigate variable name shadowing
  [Tooling, Code Health] refactor: split Makefile into multiple files (#816)
  [Tooling] fix and add makefile targets (#814)
  [Docs] Add a debugging tip: using transaction hashes (#786)
okdas pushed a commit that referenced this pull request Nov 14, 2024
…816)

## Summary

The Makefile has gotten quite large ([1185
LoC](https://github.com/pokt-network/poktroll/blob/main/Makefile#L1185)).
This PR splits the makefile into multiple files, focusing on large
groups of targets and groups related to on-chain state or local/devnets:
- warnings.mk
- todos.mk
- checks.mk
- tests.mk
- localnet.mk
- testnet.mk
- params.mk
- applications.mk
- suppliers.mk
- gateways.mk
- session.mk
- claims.mk

## Issue

- Reaction to friction experienced while working on #799

## Type of change

Select one or more from the following:

- [ ] New feature, functionality or library
- [ ] Consensus breaking; add the `consensus-breaking` label if so. See
#791 for details
- [ ] Bug fix
- [x] Code health or cleanup
- [ ] Documentation
- [ ] Other (specify)

## Testing

- [ ] **Documentation**: `make docusaurus_start`; only needed if you
make doc changes
- [x] **Unit Tests**: `make go_develop_and_test`
- [ ] **LocalNet E2E Tests**: `make test_e2e`
- [ ] **DevNet E2E Tests**: Add the `devnet-test-e2e` label to the PR.

## Sanity Checklist

- [x] I have tested my changes using the available tooling
- [x] I have commented my code
- [x] I have performed a self-review of my own code; both comments &
source code
- [ ] I create and reference any new tickets, if applicable
- [ ] I have left TODOs throughout the codebase, if applicable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code health Cleans up some code devnet devnet-test-e2e push-image CI related - pushes images to ghcr.io tooling Tooling - CLI, scripts, helpers, off-chain, etc...
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

[Testing] E2E Test Refactoring
2 participants