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

chore: update more default parameters (backport #2417) #2496

Merged
merged 3 commits into from
Sep 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2023

This is an automatic backport of pull request #2417 done by Mergify.
Cherry-pick of 9fa9fbf has failed:

On branch mergify/bp/v1.x/pr-2417
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 9fa9fbf.
  (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:   app/app.go
	modified:   app/default_overrides_test.go
	modified:   pkg/appconsts/consensus_consts.go
	modified:   specs/src/specs/params.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/default_overrides.go

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

## Overview

minor update to the defaults to match #2416. ofc, these are not
consensus breaking as they're just changes to the defaults. This saves
us from having to manually change this for mainnet or mocha

## Checklist

- [x] New and updated code has appropriate documentation
- [x] New and updated code has new and/or updated testing
- [x] Required CI checks are passing
- [x] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords

---------

Co-authored-by: Rootul P <rootulp@gmail.com>
(cherry picked from commit 9fa9fbf)

# Conflicts:
#	app/default_overrides.go
@mergify mergify bot added the conflicts label Sep 14, 2023
@celestia-bot celestia-bot requested a review from a team September 14, 2023 09:43
@github-actions github-actions bot added the bot item was created by a bot label Sep 14, 2023
@github-actions
Copy link

PR Preview Action v1.4.4
🚀 Deployed preview to https://celestiaorg.github.io/celestia-app/pr-preview/pr-2496/
on branch gh-pages at 2023-09-14 09:43 UTC

@evan-forbes evan-forbes enabled auto-merge (squash) September 14, 2023 13:08
@codecov-commenter
Copy link

Codecov Report

Merging #2496 (4198b15) into v1.x (603d58d) will decrease coverage by 0.08%.
The diff coverage is 1.66%.

@@            Coverage Diff             @@
##             v1.x    #2496      +/-   ##
==========================================
- Coverage   20.48%   20.41%   -0.08%     
==========================================
  Files         138      138              
  Lines       15803    15861      +58     
==========================================
  Hits         3238     3238              
- Misses      12257    12315      +58     
  Partials      308      308              
Files Changed Coverage Δ
app/app.go 4.46% <ø> (ø)
app/default_overrides.go 12.03% <1.66%> (-9.31%) ⬇️

@evan-forbes evan-forbes merged commit 0d70807 into v1.x Sep 14, 2023
23 checks passed
@evan-forbes evan-forbes deleted the mergify/bp/v1.x/pr-2417 branch September 14, 2023 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants