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

rpc: rework binary encoding. BREAKING CHANGE (bp #11646) #11673

Merged
merged 6 commits into from
Aug 18, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2020

This is an automated backport of pull request #11646 done by Mergify

Cherry-pick of b5f3ced has failed:

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

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

Changes to be committed:

	modified:   Cargo.lock
	modified:   cli/src/cli.rs
	modified:   docs/src/apps/jsonrpc-api.md
	modified:   ledger-tool/src/bigtable.rs
	modified:   ledger/src/blockstore.rs
	modified:   stake-monitor/src/lib.rs
	modified:   transaction-status/src/lib.rs
	modified:   watchtower/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   transaction-status/Cargo.toml

Cherry-pick of 2ebc68a has failed:

On branch mergify/bp/v1.2/pr-11646
Your branch is ahead of 'origin/v1.2' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2ebc68a9e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   transaction-status/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   cli/src/cli.rs

Cherry-pick of 757e147 has failed:

On branch mergify/bp/v1.2/pr-11646
Your branch is ahead of 'origin/v1.2' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 757e147b3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   account-decoder/src/lib.rs
	modified:   client/src/rpc_client.rs
	modified:   core/src/rpc.rs
	modified:   docs/src/apps/jsonrpc-api.md
	modified:   transaction-status/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   cli/src/cli.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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 simulator.

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

mvines added 5 commits August 18, 2020 00:27
…edBlock

(cherry picked from commit b5f3ced)

# Conflicts:
#	transaction-status/Cargo.toml
(cherry picked from commit 2ebc68a)

# Conflicts:
#	cli/src/cli.rs
(cherry picked from commit 757e147)

# Conflicts:
#	cli/src/cli.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 18, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 18, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 18, 2020
@mvines mvines force-pushed the mergify/bp/v1.2/pr-11646 branch from b90ebae to eb79889 Compare August 18, 2020 01:20
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Aug 18, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 18, 2020

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 18, 2020
@codecov
Copy link

codecov bot commented Aug 18, 2020

Codecov Report

Merging #11673 into v1.2 will decrease coverage by 0.0%.
The diff coverage is 61.9%.

@@           Coverage Diff            @@
##            v1.2   #11673     +/-   ##
========================================
- Coverage   81.9%    81.9%   -0.1%     
========================================
  Files        320      320             
  Lines      76471    76495     +24     
========================================
- Hits       62695    62686      -9     
- Misses     13776    13809     +33     

@mergify mergify bot merged commit d6ca879 into v1.2 Aug 18, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-11646 branch August 18, 2020 04:18
mvines added a commit that referenced this pull request Aug 18, 2020
mvines added a commit to mvines/solana that referenced this pull request Aug 18, 2020
mvines added a commit to mvines/solana that referenced this pull request Aug 18, 2020
mvines added a commit that referenced this pull request Aug 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant