Repository navigation
fix: regenerate counterfeiter fakes and demultiplex FSC container logs - #1060
Merged
mbrandenburger merged 2 commits intoNov 4, 2026
Merged
Conversation
munapower
approved these changes
Nov 4, 2026
The epid test generated its HTTP client fake into epid/fakes, while the test imports internal/attestation/fakes, and it relied on a counterfeiter binary on the PATH. Use the counterfeiter:generate directive with the pinned module version, like the other packages, and point it at the directory the test imports. Regenerate all fakes with counterfeiter v6.14.0 from go.mod, so that running go generate no longer produces a diff. Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
The chaincode containers run without a TTY, so the Docker log stream prefixes every frame with an 8-byte stdout/stderr header. Reading it with a plain scanner put those bytes into the debug log. Demultiplex the stream with stdcopy before scanning it. Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com> Fixes: hyperledger#1057
mbrandenburger
force-pushed
the
fix/fakes-and-docker-logs
branch
from
November 4, 2026 19:42
7e3d1da to
cab5b6f
Compare
This file contains hidden or 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
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.
Fixes #1057
internal/attestation/epid/ias_test.gousescounterfeiter:generatewith the module pinned ingo.mod, like the other packages, and writes the fake tointernal/attestation/fakes, where the test imports it from.go generateno longer produces a diff. That accounts for most of the line count.stdcopy.StdCopybefore scanning them, which removes the 8-byte frame headers from the debug log.The tests in
internal,ercc/registry,ecc/chaincodeandsecret-keeper-gopass with the new fakes, andextension/fscbuilds and vets. I didn't run the FSC integration test.