Skip to content

v1.17: default staked client in LocalCluster (backport of #716)#723

Merged
t-nelson merged 2 commits intov1.17from
mergify/bp/v1.17/pr-716
Apr 10, 2024
Merged

v1.17: default staked client in LocalCluster (backport of #716)#723
t-nelson merged 2 commits intov1.17from
mergify/bp/v1.17/pr-716

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Apr 10, 2024

Problem

Summary of Changes

  • LocalCluster connection cache defaults to use a client id with stake override to treat it like staked connection

Fixes #


This is an automatic backport of pull request #716 done by [Mergify](https://mergify.com).

* default staked client in LocalCluster

* fix underflow

(cherry picked from commit e91a5e2)

# Conflicts:
#	local-cluster/tests/local_cluster.rs
@mergify mergify Bot added the conflicts label Apr 10, 2024
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Apr 10, 2024

Cherry-pick of e91a5e2 has failed:

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

You are currently cherry-picking commit e91a5e2744.
  (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:   local-cluster/src/local_cluster.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   local-cluster/tests/local_cluster.rs

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

@apfitzge
Copy link
Copy Markdown

If merge this first, can rebase #696 with the removed test re-added.

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.6%. Comparing base (57ea214) to head (e9b3efa).

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17     #723   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         806      806           
  Lines      219284   219284           
=======================================
+ Hits       179002   179033   +31     
+ Misses      40282    40251   -31     

@t-nelson t-nelson merged commit be83469 into v1.17 Apr 10, 2024
@t-nelson t-nelson deleted the mergify/bp/v1.17/pr-716 branch April 10, 2024 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants