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(client): allow overwritting client.toml #17513

Merged
merged 20 commits into from
Aug 29, 2023
Merged

Conversation

julienrbrt
Copy link
Member

@julienrbrt julienrbrt commented Aug 23, 2023

Description

Closes: #17253

I will make this PR non-breaking and backport this in v0.50.1.


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • run make lint and make test
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@github-actions github-actions bot added C:CLI C:Confix Issues and PR related to Confix labels Aug 23, 2023
client/config/config.go Fixed Show fixed Hide fixed
@@ -95,10 +135,10 @@ func initAppConfig() (string, interface{}) {
customAppTemplate := serverconfig.DefaultConfigTemplate + `
[wasm]
# This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries
query_gas_limit = 300000
query-gas-limit = {{ .WASM.QueryGasLimit }}
Copy link
Member Author

@julienrbrt julienrbrt Aug 24, 2023

Choose a reason for hiding this comment

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

This needs to be backported to all previous versions to give a proper example.

@github-actions github-actions bot removed the C:Confix Issues and PR related to Confix label Aug 24, 2023
server/config/toml.go Fixed Show fixed Hide fixed
@julienrbrt julienrbrt marked this pull request as ready for review August 24, 2023 12:29
@julienrbrt julienrbrt requested a review from a team as a code owner August 24, 2023 12:29
}

// ReadFromClientConfig reads values from client.toml file and updates them in client Context
func ReadFromClientConfig(ctx client.Context) (client.Context, error) {
// CreateClientConfigAndContext reads the client.toml file and returns a new populated client.Context
Copy link
Member Author

Choose a reason for hiding this comment

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

The name is long but defines better what the function does than how ReadFromClientConfig was named.

@julienrbrt julienrbrt requested review from alexanderbez and ValarDragon and removed request for samricotta and atheeshp August 24, 2023 12:43
client/config/config.go Outdated Show resolved Hide resolved
simapp/simd/cmd/config.go Outdated Show resolved Hide resolved
simapp/simd/cmd/config.go Outdated Show resolved Hide resolved
Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

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

utACK 🎉

Copy link
Contributor

@likhita-809 likhita-809 left a comment

Choose a reason for hiding this comment

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

ACK

@julienrbrt julienrbrt added this pull request to the merge queue Aug 29, 2023
Merged via the queue into main with commit 6601713 Aug 29, 2023
50 checks passed
@julienrbrt julienrbrt deleted the julien/custom-client-cfg branch August 29, 2023 08:59
@julienrbrt
Copy link
Member Author

julienrbrt commented Nov 10, 2023

Backporting in a purely additive way

EDIT: won't do until requested.

@julienrbrt
Copy link
Member Author

@Mergifyio backport release/v0.50.x

Copy link
Contributor

mergify bot commented Nov 10, 2023

backport release/v0.50.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Nov 10, 2023
(cherry picked from commit 6601713)

# Conflicts:
#	CHANGELOG.md
#	client/config/config.go
#	client/config/config_test.go
#	client/tx/factory.go
#	simapp/simd/cmd/commands.go
#	simapp/simd/cmd/root.go
#	simapp/simd/cmd/root_v2.go
#	simapp/simd/cmd/testnet.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature]: Allow overriding the client.toml config
4 participants