diff --git a/docs/docs/02-guide/06-ibc.md b/docs/docs/02-guide/06-ibc.md index faa01a1cae..abddcd9c14 100644 --- a/docs/docs/02-guide/06-ibc.md +++ b/docs/docs/02-guide/06-ibc.md @@ -432,9 +432,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: @@ -463,9 +460,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: diff --git a/docs/docs/02-guide/07-interchange/02-init.md b/docs/docs/02-guide/07-interchange/02-init.md index a8c96755f2..2f19beee72 100644 --- a/docs/docs/02-guide/07-interchange/02-init.md +++ b/docs/docs/02-guide/07-interchange/02-init.md @@ -129,9 +129,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: @@ -164,9 +161,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: diff --git a/docs/docs/06-migration/v28.0.0.md b/docs/docs/06-migration/v28.0.0.md index 9c618fefd8..7ece1836f6 100644 --- a/docs/docs/06-migration/v28.0.0.md +++ b/docs/docs/06-migration/v28.0.0.md @@ -81,15 +81,15 @@ This guide provides a step-by-step process for developers to upgrade their appli - **Old Code**: ```go - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PostKey)) + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PostKey)) ``` - **New Code**: ```go - storeAdapter := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)) - store := prefix.NewStore(storeAdapter, types.KeyPrefix(types.PostKey)) + storeAdapter := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)) + store := prefix.NewStore(storeAdapter, types.KeyPrefix(types.PostKey)) ``` diff --git a/docs/docs/08-references/02-config.md b/docs/docs/08-references/02-config.md index 34347b9565..d0228a4a18 100644 --- a/docs/docs/08-references/02-config.md +++ b/docs/docs/08-references/02-config.md @@ -203,17 +203,6 @@ build: path: "myproto" ``` -Ignite comes with required third-party proto out of the box. Ignite also looks -into `third_party/proto` and `proto_vendor` directories for extra proto files. -If your project keeps third-party proto files in a different directory, you -should tell Ignite about this: - -```yml -build: - proto: - third_party_paths: ["my_third_party/proto"] -``` - ## Faucet The faucet service sends tokens to addresses. diff --git a/docs/versioned_docs/version-v28/02-guide/06-ibc.md b/docs/versioned_docs/version-v28/02-guide/06-ibc.md index faa01a1cae..abddcd9c14 100644 --- a/docs/versioned_docs/version-v28/02-guide/06-ibc.md +++ b/docs/versioned_docs/version-v28/02-guide/06-ibc.md @@ -432,9 +432,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: @@ -463,9 +460,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: diff --git a/docs/versioned_docs/version-v28/02-guide/07-interchange/02-init.md b/docs/versioned_docs/version-v28/02-guide/07-interchange/02-init.md index a8c96755f2..2f19beee72 100644 --- a/docs/versioned_docs/version-v28/02-guide/07-interchange/02-init.md +++ b/docs/versioned_docs/version-v28/02-guide/07-interchange/02-init.md @@ -129,9 +129,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: @@ -164,9 +161,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: diff --git a/docs/versioned_docs/version-v28/08-references/02-config.md b/docs/versioned_docs/version-v28/08-references/02-config.md index 1eb4aa7f8f..a266d870af 100644 --- a/docs/versioned_docs/version-v28/08-references/02-config.md +++ b/docs/versioned_docs/version-v28/08-references/02-config.md @@ -183,17 +183,6 @@ build: path: "myproto" ``` -Ignite comes with required third-party proto out of the box. Ignite also looks -into `third_party/proto` and `proto_vendor` directories for extra proto files. -If your project keeps third-party proto files in a different directory, you -should tell Ignite about this: - -```yml -build: - proto: - third_party_paths: ["my_third_party/proto"] -``` - ## Faucet The faucet service sends tokens to addresses. diff --git a/ignite/config/chain/base/config.go b/ignite/config/chain/base/config.go index f695df61cf..389ae72b9b 100644 --- a/ignite/config/chain/base/config.go +++ b/ignite/config/chain/base/config.go @@ -48,10 +48,6 @@ type Build struct { type Proto struct { // Path is the relative path of where app's proto files are located at. Path string `yaml:"path"` - - // ThirdPartyPath is the relative path of where the third party proto files are - // located that used by the app. - ThirdPartyPaths []string `yaml:"third_party_paths"` } // Client configures code generation for clients. @@ -204,8 +200,7 @@ func DefaultConfig() Config { return Config{ Build: Build{ Proto: Proto{ - Path: "proto", - ThirdPartyPaths: []string{"third_party/proto", "proto_vendor"}, + Path: "proto", }, }, Faucet: Faucet{ diff --git a/ignite/config/chain/v1/config_test.go b/ignite/config/chain/v1/config_test.go index 02538f06b7..4950851e14 100644 --- a/ignite/config/chain/v1/config_test.go +++ b/ignite/config/chain/v1/config_test.go @@ -29,8 +29,7 @@ func TestConfigDecode(t *testing.T) { Build: base.Build{ Binary: "evmosd", Proto: base.Proto{ - Path: "proto", - ThirdPartyPaths: []string{"third_party/proto", "proto_vendor"}, + Path: "proto", }, }, Accounts: []base.Account{ diff --git a/ignite/config/chain/v1/testdata/config.yaml b/ignite/config/chain/v1/testdata/config.yaml index 82ea30a3b8..8ff61ff2fe 100644 --- a/ignite/config/chain/v1/testdata/config.yaml +++ b/ignite/config/chain/v1/testdata/config.yaml @@ -3,9 +3,6 @@ build: binary: evmosd proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: diff --git a/ignite/config/chain/v1/testdata/config2.yaml b/ignite/config/chain/v1/testdata/config2.yaml index 38c2fe42c8..d83b87ad61 100644 --- a/ignite/config/chain/v1/testdata/config2.yaml +++ b/ignite/config/chain/v1/testdata/config2.yaml @@ -3,9 +3,6 @@ build: binary: evmosd proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: diff --git a/ignite/pkg/cosmosgen/cosmosgen.go b/ignite/pkg/cosmosgen/cosmosgen.go index 0b6889ffe7..7f3917d3d7 100644 --- a/ignite/pkg/cosmosgen/cosmosgen.go +++ b/ignite/pkg/cosmosgen/cosmosgen.go @@ -17,7 +17,6 @@ import ( // generateOptions used to configure code generation. type generateOptions struct { - includeDirs []string useCache bool updateBufModule bool ev events.Bus diff --git a/ignite/pkg/cosmosgen/generate.go b/ignite/pkg/cosmosgen/generate.go index 86091bed6a..8da6d7ca8f 100644 --- a/ignite/pkg/cosmosgen/generate.go +++ b/ignite/pkg/cosmosgen/generate.go @@ -212,12 +212,7 @@ func (g *generator) setup(ctx context.Context) (err error) { } func (g *generator) getProtoIncludeFolders(modPath string) []string { - // Add default protoDir and default includeDirs - includePaths := []string{filepath.Join(modPath, g.protoDir)} - for _, dir := range g.opts.includeDirs { - includePaths = append(includePaths, filepath.Join(modPath, dir)) - } - return includePaths + return []string{filepath.Join(modPath, g.protoDir)} } func (g *generator) findBufPath(modpath string) (string, error) { diff --git a/ignite/services/chain/chain.go b/ignite/services/chain/chain.go index eeae83dcc3..54288d92a8 100644 --- a/ignite/services/chain/chain.go +++ b/ignite/services/chain/chain.go @@ -34,7 +34,6 @@ var appBackendSourceWatchPaths = []string{ "cmd", "x", "proto", - "third_party", } type ( diff --git a/integration/doctor/testdata/config-need-migrate.txt b/integration/doctor/testdata/config-need-migrate.txt index e63ad504c4..ce11ac5fd0 100644 --- a/integration/doctor/testdata/config-need-migrate.txt +++ b/integration/doctor/testdata/config-need-migrate.txt @@ -35,9 +35,6 @@ version: 1 build: proto: path: proto - third_party_paths: - - third_party/proto - - proto_vendor accounts: - name: alice coins: diff --git a/integration/relayer/cmd_relayer_test.go b/integration/relayer/cmd_relayer_test.go index a3b15f813e..4dcbf7d0b0 100644 --- a/integration/relayer/cmd_relayer_test.go +++ b/integration/relayer/cmd_relayer_test.go @@ -40,8 +40,7 @@ var ( Version: 1, Build: base.Build{ Proto: base.Proto{ - Path: "proto", - ThirdPartyPaths: []string{"third_party/proto", "proto_vendor"}, + Path: "proto", }, }, Accounts: []base.Account{ @@ -91,8 +90,7 @@ var ( Version: 1, Build: base.Build{ Proto: base.Proto{ - Path: "proto", - ThirdPartyPaths: []string{"third_party/proto", "proto_vendor"}, + Path: "proto", }, }, Accounts: []base.Account{