[Merged by Bors] - Add atxId and smesherId to api block #2224
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
this cant be merged until the api pr this depends on is approved. spacemeshos/api#126 |
lrettig
approved these changes
Dec 9, 2020
| @@ -452,7 +455,7 @@ func launchServer(t *testing.T, services ...ServiceAPI) func() { | |||
|
|
|||
| return func() { | |||
| require.NoError(t, jsonService.Close()) | |||
| grpcService.Close() | |||
| _ = grpcService.Close() | |||
There was a problem hiding this comment.
Maybe add a comment here saying something like,
// We explicitly ignore errors that occur during shutdown
|
I need to create an api release tag and update go mod here to point to the correct release before this can pass tests and be merged. |
|
make test-no-app-test fails in ci for this branch. I tried it locally on my machine with develop branch and it fails as well. |
|
bors try |
|
bors merge |
bors bot
pushed a commit
that referenced
this pull request
Dec 11, 2020
Return activationId and smesherId in blocks returned by the api. Works only with api branch `add-atx-to-bloc` so can only be merged after that branch is merged to api master branch.
tryTimed out. |
|
Build failed: |
|
bors merge |
bors bot
pushed a commit
that referenced
this pull request
Dec 11, 2020
Return activationId and smesherId in blocks returned by the api. Works only with api branch `add-atx-to-bloc` so can only be merged after that branch is merged to api master branch.
|
Build failed:
|
|
bors merge |
bors bot
pushed a commit
that referenced
this pull request
Dec 12, 2020
Return activationId and smesherId in blocks returned by the api. Works only with api branch `add-atx-to-bloc` so can only be merged after that branch is merged to api master branch.
|
Build failed:
|
|
bors merge |
bors bot
pushed a commit
that referenced
this pull request
Dec 13, 2020
Return activationId and smesherId in blocks returned by the api. Works only with api branch `add-atx-to-bloc` so can only be merged after that branch is merged to api master branch.
|
Pull request successfully merged into develop. Build succeeded: |
bors
bot
changed the title
lrettig
pushed a commit
that referenced
this pull request
Feb 3, 2021
Return activationId and smesherId in blocks returned by the api. Works only with api branch `add-atx-to-bloc` so can only be merged after that branch is merged to api master branch.
lrettig
pushed a commit
that referenced
this pull request
Feb 5, 2021
Return activationId and smesherId in blocks returned by the api. Works only with api branch `add-atx-to-bloc` so can only be merged after that branch is merged to api master branch.
lrettig
pushed a commit
that referenced
this pull request
Feb 6, 2021
Return activationId and smesherId in blocks returned by the api. Works only with api branch `add-atx-to-bloc` so can only be merged after that branch is merged to api master branch.
lrettig
pushed a commit
that referenced
this pull request
Mar 20, 2021
Return activationId and smesherId in blocks returned by the api. Works only with api branch `add-atx-to-bloc` so can only be merged after that branch is merged to api master branch.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Return activationId and smesherId in blocks returned by the api.
Works only with api branch
add-atx-to-blocso can only be merged after that branch is merged to api master branch.