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

Prepare for go 1.14 #755

Merged
merged 1 commit into from
Feb 27, 2020
Merged

Prepare for go 1.14 #755

merged 1 commit into from
Feb 27, 2020

Conversation

sykesm
Copy link
Contributor

@sykesm sykesm commented Feb 27, 2020

Before we can move to go 1.14, we need to make sure things work with go 1.14...

  • bump golang.org/x/crypto/sha3 to pick up checkptr fix
  • soften assertion in error string to handle quotes present in go 1.14
    error that is not present in go 1.13

- bump golang.org/x/crypto/sha3 to pick up checkptr fix
- soften assertion in error string to handle quotes present in go 1.14
  error that is not present in go 1.13

Change-Id: Ia046217c5ab77a5e7f5713544663be19e52e118c
Signed-off-by: Matthew Sykes <[email protected]>
@sykesm sykesm requested a review from a team as a code owner February 27, 2020 17:09
@lindluni
Copy link
Contributor

Thanks Matt, LGTM

@lindluni
Copy link
Contributor

lindluni commented Feb 27, 2020

I guess 1.14 doesn't fix pre-existing flakes

@sykesm
Copy link
Contributor Author

sykesm commented Feb 27, 2020

I guess 1.14 doesn't fix pre-existing flakes

Nope. And I just hit another one (FAB-17376).

@yacovm
Copy link
Contributor

yacovm commented Feb 27, 2020

  • bump golang.org/x/crypto/sha3 to pick up checkptr fix

Just wondering why is this necessary? We don't use sha3 in Fabric.

@yacovm yacovm merged commit e8673de into hyperledger:master Feb 27, 2020
@sykesm
Copy link
Contributor Author

sykesm commented Feb 27, 2020

  • bump golang.org/x/crypto/sha3 to pick up checkptr fix

Just wondering why is this necessary? We don't use sha3 in Fabric.

fatal error: checkptr: unsafe pointer conversion

goroutine 232 [running]:
runtime.throw(0x15e5045, 0x23)
	/usr/local/Cellar/go/1.14/libexec/src/runtime/panic.go:1112 +0x72 fp=0xc00073b920 sp=0xc00073b8f0 pc=0x1073402
runtime.checkptrAlignment(0xc0007642a9, 0x1554780, 0x1)
	/usr/local/Cellar/go/1.14/libexec/src/runtime/checkptr.go:13 +0xd0 fp=0xc00073b950 sp=0xc00073b920 pc=0x1045790
github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3.xorInUnaligned(0xc0007641c0, 0xc0007642a9, 0x88, 0xa8)
	/Users/sykesm/workspace/fabric/src/github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3/xor_unaligned.go:13 +0x60 fp=0xc00073b988 sp=0xc00073b950 pc=0x12650c0
github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3.(*state).permute(0xc0007641c0)
	/Users/sykesm/workspace/fabric/src/github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3/sha3.go:84 +0x1d3 fp=0xc00073b9d8 sp=0xc00073b988 pc=0x1263cc3
github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3.(*state).padAndPermute(0xc0007641c0, 0xc000054806)
	/Users/sykesm/workspace/fabric/src/github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3/sha3.go:117 +0x347 fp=0xc00073ba80 sp=0xc00073b9d8 pc=0x1264087
github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3.(*state).Read(0xc0007641c0, 0xc000734340, 0x20, 0x20, 0xb, 0xb, 0x1)
	/Users/sykesm/workspace/fabric/src/github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3/sha3.go:163 +0x2e0 fp=0xc00073bb10 sp=0xc00073ba80 pc=0x1264b50
github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3.(*state).Sum(0xc000764000, 0x0, 0x0, 0x0, 0xb, 0x0, 0x0)
	/Users/sykesm/workspace/fabric/src/github.com/hyperledger/fabric/vendor/golang.org/x/crypto/sha3/sha3.go:190 +0x233 fp=0xc00073bba8 sp=0xc00073bb10 pc=0x1264db3
github.com/hyperledger/fabric/bccsp/sw.(*hasher).Hash(0xc0000100e8, 0xc000200410, 0xb, 0xb, 0x16798e0, 0x1999f68, 0xc000200410, 0x10, 0x100000000000000, 0x0, ...)
	/Users/sykesm/workspace/fabric/src/github.com/hyperledger/fabric/bccsp/sw/hash.go:32 +0xca fp=0xc00073bc18 sp=0xc00073bba8 pc=0x14e2cca
github.com/hyperledger/fabric/bccsp/sw.(*CSP).Hash(0xc0000201e0, 0xc000200410, 0xb, 0xb, 0x16798e0, 0x1999f68, 0x0, 0xc00022e0c0, 0xc0004c61c0, 0xc000703568, ...)
	/Users/sykesm/workspace/fabric/src/github.com/hyperledger/fabric/bccsp/sw/impl.go:188 +0x1f9 fp=0xc00073bd10 sp=0xc00073bc18 pc=0x14e4f99
github.com/hyperledger/fabric/bccsp/sw.TestECDSALowS(0xc000465320)
	/Users/sykesm/workspace/fabric/src/github.com/hyperledger/fabric/bccsp/sw/impl_test.go:982 +0x275 fp=0xc00073bed0 sp=0xc00073bd10 pc=0x150b2b5
testing.tRunner(0xc000465320, 0x15f6518)
	/usr/local/Cellar/go/1.14/libexec/src/testing/testing.go:992 +0x1ec fp=0xc00073bfd0 sp=0xc00073bed0 pc=0x118f72c
runtime.goexit()
	/usr/local/Cellar/go/1.14/libexec/src/runtime/asm_amd64.s:1373 +0x1 fp=0xc00073bfd8 sp=0xc00073bfd0 pc=0x10a6cf1
created by testing.(*T).Run
	/usr/local/Cellar/go/1.14/libexec/src/testing/testing.go:1043 +0x661

@sykesm sykesm deleted the go-1.14-prep branch February 27, 2020 21:06
lindluni pushed a commit that referenced this pull request Nov 17, 2020
- bump golang.org/x/crypto/sha3 to pick up checkptr fix

Change-Id: Ia046217c5ab77a5e7f5713544663be19e52e118c
Signed-off-by: Matthew Sykes <[email protected]>
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.

3 participants