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

v1.2: fix: multiple named tuple result from contract #1365

Merged
merged 11 commits into from
Jul 11, 2023

Conversation

awrichar
Copy link
Contributor

Backport of #1333

EnriqueL8 and others added 5 commits July 10, 2023 10:10
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
This reverts commit 812ea5b.

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
@@ -66,7 +66,7 @@ type apiServer struct {
func InitConfig() {
httpserver.InitHTTPConfig(apiConfig, 5000)
httpserver.InitHTTPConfig(spiConfig, 5001)
httpserver.InitHTTPConfig(metricsConfig, 6000)
httpserver.InitHTTPConfig(metricsConfig, 7000)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure that we want to change the default metrics port in a patch release. Was there a reason for this change?

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
@codecov-commenter
Copy link

codecov-commenter commented Jul 11, 2023

Codecov Report

Merging #1365 (4632951) into release-1.2 (2f69789) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

@@               Coverage Diff               @@
##           release-1.2    #1365      +/-   ##
===============================================
- Coverage       100.00%   99.98%   -0.02%     
===============================================
  Files              305      305              
  Lines            20027    20040      +13     
===============================================
+ Hits             20027    20036       +9     
- Misses               0        3       +3     
- Partials             0        1       +1     
Impacted Files Coverage Δ
internal/blockchain/ethereum/ethereum.go 100.00% <100.00%> (ø)

... and 5 files with indirect coverage changes

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
@nguyer nguyer merged commit eda9463 into hyperledger:release-1.2 Jul 11, 2023
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants