Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Rename KeypairUtil to Signer (bp #8360) #8366

Merged
merged 1 commit into from
Feb 21, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 20, 2020

This is an automated backport of pull request #8360 done by Mergify.io

Cherry-pick of ab361a8 has failed:

On branch mergify/bp/v0.23/pr-8360
Your branch is up to date with 'origin/v0.23'.

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

Changes to be committed:

	modified:   archiver-lib/src/archiver.rs
	modified:   archiver/src/main.rs
	modified:   bench-exchange/src/bench.rs
	modified:   bench-exchange/src/main.rs
	modified:   bench-exchange/tests/bench_exchange.rs
	modified:   bench-tps/src/bench.rs
	modified:   bench-tps/src/main.rs
	modified:   bench-tps/tests/bench_tps.rs
	modified:   book/src/proposals/cluster-test-framework.md
	modified:   chacha/src/chacha.rs
	modified:   clap-utils/src/input_parsers.rs
	modified:   clap-utils/src/keypair.rs
	modified:   cli/src/cli.rs
	modified:   cli/src/cluster_query.rs
	modified:   cli/src/nonce.rs
	modified:   cli/src/stake.rs
	modified:   cli/src/storage.rs
	modified:   cli/src/validator_info.rs
	modified:   cli/src/vote.rs
	modified:   cli/tests/nonce.rs
	modified:   cli/tests/pay.rs
	modified:   cli/tests/request_airdrop.rs
	modified:   cli/tests/stake.rs
	modified:   cli/tests/transfer.rs
	modified:   core/benches/banking_stage.rs
	modified:   core/benches/poh_verify.rs
	modified:   core/benches/shredder.rs
	modified:   core/benches/sigverify_stage.rs
	modified:   core/src/banking_stage.rs
	modified:   core/src/blockstream.rs
	modified:   core/src/blockstream_service.rs
	modified:   core/src/broadcast_stage.rs
	modified:   core/src/broadcast_stage/standard_broadcast_run.rs
	modified:   core/src/cluster_info.rs
	modified:   core/src/cluster_info_vote_listener.rs
	modified:   core/src/contact_info.rs
	modified:   core/src/crds_value.rs
	modified:   core/src/gen_keys.rs
	modified:   core/src/gossip_service.rs
	modified:   core/src/replay_stage.rs
	modified:   core/src/rpc.rs
	modified:   core/src/rpc_pubsub.rs
	modified:   core/src/rpc_service.rs
	modified:   core/src/rpc_subscriptions.rs
	modified:   core/src/serve_repair.rs
	modified:   core/src/sigverify_shreds.rs
	modified:   core/src/storage_stage.rs
	modified:   core/src/tvu.rs
	modified:   core/src/validator.rs
	modified:   core/src/window_service.rs
	modified:   core/tests/bank_forks.rs
	modified:   core/tests/gossip.rs
	modified:   core/tests/storage_stage.rs
	modified:   faucet/src/faucet.rs
	modified:   faucet/tests/local-faucet.rs
	modified:   genesis/src/main.rs
	modified:   install/src/command.rs
	modified:   keygen/src/keygen.rs
	modified:   ledger/benches/sigverify_shreds.rs
	modified:   ledger/src/blockstore.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   ledger/src/entry.rs
	modified:   ledger/src/shred.rs
	modified:   ledger/src/sigverify_shreds.rs
	modified:   ledger/tests/shred.rs
	modified:   local-cluster/src/cluster_tests.rs
	modified:   local-cluster/src/local_cluster.rs
	modified:   local-cluster/tests/archiver.rs
	modified:   local-cluster/tests/local_cluster.rs
	modified:   perf/src/packet.rs
	modified:   perf/src/test_tx.rs
	modified:   programs/budget/src/budget_processor.rs
	modified:   programs/config/src/config_processor.rs
	modified:   programs/exchange/src/exchange_processor.rs
	modified:   programs/failure/tests/failure.rs
	modified:   programs/librapay/src/lib.rs
	modified:   programs/librapay/src/librapay_transaction.rs
	modified:   programs/ownable/src/ownable_processor.rs
	modified:   programs/vest/src/vest_processor.rs
	modified:   remote-wallet/src/remote_keypair.rs
	modified:   runtime/src/accounts_db.rs
	modified:   runtime/src/accounts_index.rs
	modified:   runtime/src/genesis_utils.rs
	modified:   runtime/src/nonce_utils.rs
	modified:   runtime/src/system_instruction_processor.rs
	modified:   runtime/tests/stake.rs
	modified:   runtime/tests/storage.rs
	modified:   sdk-c/src/lib.rs
	modified:   sdk/src/genesis_config.rs
	modified:   sdk/src/signature.rs
	modified:   sdk/src/system_transaction.rs
	modified:   validator/src/main.rs
	modified:   vote-signer/src/rpc.rs

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

	both modified:   client/src/thin_client.rs
	both modified:   core/src/consensus.rs
	both modified:   core/tests/client.rs
	both modified:   ledger/src/staking_utils.rs
	both modified:   programs/bpf/tests/programs.rs
	both modified:   runtime/benches/bank.rs
	both modified:   runtime/src/accounts.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/bank_client.rs
	both modified:   runtime/src/loader_utils.rs
	both modified:   runtime/src/storage_utils.rs
	both modified:   runtime/tests/noop.rs
	both modified:   sdk/src/message.rs
	deleted by us:   sdk/src/signers.rs
	both modified:   sdk/src/transaction.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
  • @Mergifyio backports <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/

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 20, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 20, 2020
@CriesofCarrots
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Feb 20, 2020

Command rebase: failure

Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Rename KeypairUtil to Signer (#8360)
Using index info to reconstruct a base tree...
M archiver-lib/src/archiver.rs
M bench-exchange/src/bench.rs
M client/src/thin_client.rs
M ledger/src/staking_utils.rs
M programs/ownable/src/ownable_processor.rs
M programs/vest/src/vest_processor.rs
M runtime/src/accounts.rs
M runtime/src/bank_client.rs
M runtime/tests/stake.rs
M runtime/tests/storage.rs
M sdk-c/src/lib.rs
M sdk/src/transaction.rs
Falling back to patching base and 3-way merge...
Auto-merging sdk/src/transaction.rs
Auto-merging sdk/src/signers.rs
CONFLICT (add/add): Merge conflict in sdk/src/signers.rs
Auto-merging sdk-c/src/lib.rs
Auto-merging runtime/tests/storage.rs
Auto-merging runtime/tests/stake.rs
Auto-merging runtime/src/bank_client.rs
CONFLICT (content): Merge conflict in runtime/src/bank_client.rs
Auto-merging runtime/src/accounts.rs
Auto-merging programs/vest/src/vest_processor.rs
Auto-merging programs/ownable/src/ownable_processor.rs
Auto-merging ledger/src/staking_utils.rs
CONFLICT (content): Merge conflict in ledger/src/staking_utils.rs
Auto-merging client/src/thin_client.rs
CONFLICT (content): Merge conflict in client/src/thin_client.rs
Auto-merging bench-exchange/src/bench.rs
Auto-merging archiver-lib/src/archiver.rs
error: Failed to merge in the changes.
Patch failed at 0001 Rename KeypairUtil to Signer (#8360)
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: 80308

@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v0.23/pr-8360 branch from d6fcb52 to cd39c5f Compare February 20, 2020 22:23
automerge

(cherry picked from commit ab361a8)
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v0.23/pr-8360 branch from cd39c5f to 0c39575 Compare February 20, 2020 23:26
@codecov
Copy link

codecov bot commented Feb 20, 2020

Codecov Report

❗ No coverage uploaded for pull request base (v0.23@9dffc3a). Click here to learn what that means.
The diff coverage is 100%.

@@           Coverage Diff           @@
##             v0.23   #8366   +/-   ##
=======================================
  Coverage         ?   80.7%           
=======================================
  Files            ?     251           
  Lines            ?   55027           
  Branches         ?       0           
=======================================
  Hits             ?   44452           
  Misses           ?   10575           
  Partials         ?       0

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes labels Feb 20, 2020
@solana-grimes solana-grimes merged commit 0287781 into v0.23 Feb 21, 2020
@mergify mergify bot deleted the mergify/bp/v0.23/pr-8360 branch February 21, 2020 00:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants