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

Move stake_weighted_timestamp module (backport #18114) #18119

Merged
merged 2 commits into from
Jun 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2021

This is an automatic backport of pull request #18114 done by Mergify.
Cherry-pick of 19fe1dd has failed:

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

You are currently cherry-picking commit 19fe1dd46.
  (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:
	renamed:    sdk/src/stake_weighted_timestamp.rs -> runtime/src/stake_weighted_timestamp.rs
	modified:   sdk/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/lib.rs

To fix up this pull request, you can check it out 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 config editor.

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

* Move timestamp module into runtime

* Less public

* Remove unused enum

(cherry picked from commit 19fe1dd)

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/lib.rs
@mergify mergify bot added the conflicts label Jun 21, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 21, 2021
@codecov
Copy link

codecov bot commented Jun 22, 2021

Codecov Report

Merging #18119 (b1cb378) into v1.6 (06d6e35) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.6   #18119   +/-   ##
=======================================
  Coverage    82.6%    82.6%           
=======================================
  Files         423      423           
  Lines      117155   117155           
=======================================
+ Hits        96778    96803   +25     
+ Misses      20377    20352   -25     

@mergify mergify bot merged commit e259388 into v1.6 Jun 22, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-18114 branch June 22, 2021 00:28
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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 conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant