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

feat: remove protoc pkg and also nodetime helpers ts-proto and sta (backport #4090) #4224

Merged
merged 14 commits into from
Jul 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2024

Description

stop using the protoc with the node plugins so we can remove the node time binary. This PR's makes all ts generation using the buf generate command.

Changes

  • Move buf mode update to buf dep update;
  • Remove protoc and nodetime;
  • Add buf.lock dependency digest;

How to test

ignite s chain venus && cd venus && ignite g ts-client

check the ts-client folder into the chain


This is an automatic backport of pull request #4090 done by Mergify.

…ta` (#4090)

* remove protoc

* add changelog

* run go mod tidy

* remove unused proto folder handling

* add ts-client tests

* remove unused methods

* use import includes instead manual

* use buf dep instead buf mod

* change buf mod update to comand to buf dep update

* improve code readbility

* bump buf.build

* bump buf into the go.mod

* bump protobuf pkgs for buf

* check if the folder has proto before update buf dependencies

---------

Co-authored-by: Pantani <Pantani>
(cherry picked from commit 8e0937d)

# Conflicts:
#	go.mod
#	go.sum
#	ignite/internal/plugin/testdata/execute_fail/go.mod
#	ignite/internal/plugin/testdata/execute_ok/go.mod
#	ignite/internal/tools/gen-config-doc/go.mod
#	ignite/internal/tools/gen-config-doc/go.sum
#	ignite/internal/tools/gen-mig-diffs/go.mod
#	ignite/internal/tools/gen-mig-diffs/go.sum
#	ignite/pkg/cosmosbuf/buf.go
#	ignite/pkg/cosmosgen/generate_go.go
#	ignite/pkg/cosmosgen/generate_openapi.go
#	ignite/pkg/cosmosgen/generate_typescript.go
#	ignite/pkg/nodetime/nodetime.go
#	ignite/pkg/nodetime/programs/sta/sta.go
#	ignite/pkg/nodetime/programs/ts-proto/tsproto.go
#	ignite/pkg/protoc/protoc.go
#	ignite/templates/app/files/go.mod.plush
#	ignite/templates/app/files/proto/buf.lock
#	integration/doctor/testdata/missing-tools.go.txt
#	integration/plugin/testdata/example-plugin/go.mod
Copy link
Contributor Author

mergify bot commented Jul 1, 2024

Cherry-pick of 8e0937d has failed:

On branch mergify/bp/release/v28.x.y/pr-4090
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit 8e0937d9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .gitignore
	modified:   changelog.md
	modified:   ignite/pkg/cosmosanalysis/app/testdata/modules/app_config/go.mod
	modified:   ignite/pkg/cosmosanalysis/app/testdata/modules/runtime/go.mod
	modified:   ignite/pkg/cosmosanalysis/app/testdata/modules/single_app/go.mod
	modified:   ignite/pkg/cosmosanalysis/app/testdata/modules/spn/go.mod
	modified:   ignite/pkg/cosmosgen/generate.go
	new file:   ignite/pkg/cosmosgen/sta.go
	modified:   ignite/pkg/cosmosver/testdata/chain-sdk-local-fork/go.mod
	modified:   integration/cosmosgen/cosmosgen_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   ignite/internal/plugin/testdata/execute_fail/go.mod
	both modified:   ignite/internal/plugin/testdata/execute_ok/go.mod
	deleted by us:   ignite/internal/tools/gen-config-doc/go.mod
	deleted by us:   ignite/internal/tools/gen-config-doc/go.sum
	deleted by us:   ignite/internal/tools/gen-mig-diffs/go.mod
	deleted by us:   ignite/internal/tools/gen-mig-diffs/go.sum
	both modified:   ignite/pkg/cosmosbuf/buf.go
	both modified:   ignite/pkg/cosmosgen/generate_go.go
	both modified:   ignite/pkg/cosmosgen/generate_openapi.go
	both modified:   ignite/pkg/cosmosgen/generate_typescript.go
	deleted by them: ignite/pkg/nodetime/nodetime.go
	deleted by them: ignite/pkg/nodetime/programs/sta/sta.go
	deleted by them: ignite/pkg/nodetime/programs/ts-proto/tsproto.go
	deleted by them: ignite/pkg/protoc/protoc.go
	both modified:   ignite/templates/app/files/go.mod.plush
	both modified:   ignite/templates/app/files/proto/buf.lock
	both modified:   integration/doctor/testdata/missing-tools.go.txt
	both modified:   integration/plugin/testdata/example-plugin/go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Pantani Pantani marked this pull request as draft July 2, 2024 11:58
@Pantani Pantani closed this Jul 4, 2024
@Pantani Pantani deleted the mergify/bp/release/v28.x.y/pr-4090 branch July 4, 2024 12:07
@Pantani Pantani restored the mergify/bp/release/v28.x.y/pr-4090 branch July 10, 2024 00:59
@Pantani Pantani reopened this Jul 10, 2024
…/release/v28.x.y/pr-4090

# Conflicts:
#	go.mod
#	go.sum
#	ignite/pkg/cosmosbuf/buf.go
#	integration/doctor/testdata/missing-tools.go.txt
Pantani added 3 commits July 10, 2024 12:22
…/release/v28.x.y/pr-4090

# Conflicts:
#	go.mod
#	go.sum
#	ignite/pkg/cosmosgen/generate.go
#	ignite/pkg/cosmosgen/generate_openapi.go
#	ignite/templates/app/files/go.mod.plush
#	ignite/templates/app/files/proto/buf.lock
…/release/v28.x.y/pr-4090

# Conflicts:
#	go.sum
#	ignite/pkg/cosmosgen/generate_typescript.go
#	integration/plugin/testdata/example-plugin/go.mod
@Pantani Pantani marked this pull request as ready for review July 10, 2024 23:31
@Pantani Pantani self-assigned this Jul 10, 2024
@Pantani Pantani marked this pull request as draft July 11, 2024 21:39
…/release/v28.x.y/pr-4090

# Conflicts:
#	ignite/pkg/nodetime/nodetime.go
@Pantani Pantani marked this pull request as ready for review July 15, 2024 12:44
@julienrbrt julienrbrt linked an issue Jul 15, 2024 that may be closed by this pull request
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

tACK!

@Pantani Pantani merged commit c1ae9c2 into release/v28.x.y Jul 15, 2024
44 checks passed
@Pantani Pantani deleted the mergify/bp/release/v28.x.y/pr-4090 branch July 15, 2024 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Generate ts-client with minimal chain does not work
2 participants