Skip to content

Commit

Permalink
Merge remote-tracking branch 'pokt/main' into issues/584/event/applic…
Browse files Browse the repository at this point in the history
…ation-overserviced

* pokt/main:
  [TODO] Blockers @okdas (#674)
  [TODO_BLOCKER] chore: Remove stale TODO_BLOCKERs (#694)
  [TODO] refactor: query expiring claims w/ index (#671)
  [TODOs] `grace_period_end_offset_blocks` validation & cleanup (#667)
  [Testing] add account balance coverage to account settlement (#670)
  [Application] Auto-undelegation of unstaked gateways (#692)
  [RelayMiner] Fix LeanClient mutiple suppliers support (#662)
  • Loading branch information
bryanchriswhite committed Jul 16, 2024
2 parents b323540 + c6d987c commit a310e58
Show file tree
Hide file tree
Showing 97 changed files with 1,948 additions and 617 deletions.
21 changes: 9 additions & 12 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
linters-settings:
govet:
check-shadowing: true
enable:
- shadow

# TODO_TECHDEBT: Enable each linter listed, 1 by 1, fixing issues as they appear.
# Don't forget to delete the `disable-all: true` line as well.
linters:
disable-all: true
enable:
# - govet
# - revive
# - errcheck
# - unused
- errcheck
- gosimple
- goimports
- govet
- ineffassign
- staticcheck
- unused

issues:
exclude-use-default: true
max-issues-per-linter: 0
max-same-issues: 0
# TODO_CONSIDERATION/TODO_TECHDEBT: Perhaps we should prefer enforcing the best
# practices suggested by the linters over convention or the default in generated
# code (where possible). The more exceptions we have, the bigger the gaps will be
# in our linting coverage. We could eliminate or reduce these exceptions step-
# by-step.
exclude-rules:
# Exclude cosmos-sdk module genesis.go files as they are generated with an
# empty import block containing a comment used by ignite CLI.
Expand All @@ -48,6 +44,7 @@ issues:
- path: ^x/.+/codec.go$
linters:
- revive
# Exclude test files from errcheck linter
- path: _test\.go$
linters:
- errcheck
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,10 @@ endif
####################

# TODO_IMPROVE(@okdas): Add other dependencies (ignite, docker, k8s, etc) here
# TODO_BLOCKER(@okdas): bump `golangci-lint` when we upgrade golang to 1.21+
.PHONY: install_ci_deps
install_ci_deps: ## Installs `mockgen` and other go tools
go install "github.com/golang/mock/[email protected]" && mockgen --version
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3 && golangci-lint --version
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1 && golangci-lint --version
go install golang.org/x/tools/cmd/goimports@latest
go install github.com/mikefarah/yq/v4@latest

Expand Down
20 changes: 10 additions & 10 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,20 +150,20 @@ configmap_create(
secret_create_generic(
"poktrolld-keys", from_file=listdir("localnet/poktrolld/keyring-test/")
)

# Import validator keys for the poktrolld helm chart to consume
secret_create_generic(
"poktrolld-validator-keys",
from_file=[
"localnet/poktrolld/config/node_key.json",
"localnet/poktrolld/config/priv_validator_key.json",
],
)

# Import configuration files into Kubernetes ConfigMap
configmap_create(
"poktrolld-configs", from_file=listdir("localnet/poktrolld/config/"), watch=True
)
# TODO_BLOCKER(@okdas): Import validator keys when we switch to `poktrolld` helm chart
# by uncommenting the following lines:
# load("ext://secret", "secret_create_generic")
# secret_create_generic(
# "poktrolld-validator-keys",
# from_file=[
# "localnet/poktrolld/config/node_key.json",
# "localnet/poktrolld/config/priv_validator_key.json",
# ],
# )

# Hot reload protobuf changes
local_resource(
Expand Down
Loading

0 comments on commit a310e58

Please sign in to comment.