forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix unit test, safe cancel context

Browse source
This commit is contained in:
Nguyen Sy Thanh Son 2018-07-16 06:44:51 +00:00
parent dd353d6bb5
commit 66b1e8ad50
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/puppeth/wizard_genesis.go
View file

@ -173,12 +173,13 @@ func (w *wizard) makeGenesis() {
validatorAddress, _, err := validatorContract.DeployValidator(transactOpts, contractBackend) validatorAddress, _, err := validatorContract.DeployValidator(transactOpts, contractBackend)
if err != nil { if err != nil {
fmt.Println("can't deploy root registry: %v", err) fmt.Println("Can't deploy root registry")
} }
contractBackend.Commit() contractBackend.Commit()
d := time.Now().Add(1000 * time.Millisecond) d := time.Now().Add(1000 * time.Millisecond)
ctx, _ := context.WithDeadline(context.Background(), d) ctx, cancel := context.WithDeadline(context.Background(), d)
defer cancel()
code, _ := contractBackend.CodeAt(ctx, validatorAddress, nil) code, _ := contractBackend.CodeAt(ctx, validatorAddress, nil)
storage := make(map[common.Hash]common.Hash) storage := make(map[common.Hash]common.Hash)
f := func(key, val common.Hash) bool { f := func(key, val common.Hash) bool {

6
contracts/blocksigner/blocksigner_test.go
View file

@ -8,6 +8,7 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends" "github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
) )
@ -21,14 +22,15 @@ func TestBlockSigner(t *testing.T) {
contractBackend := backends.NewSimulatedBackend(core.GenesisAlloc{addr: {Balance: big.NewInt(1000000000)}}) contractBackend := backends.NewSimulatedBackend(core.GenesisAlloc{addr: {Balance: big.NewInt(1000000000)}})
transactOpts := bind.NewKeyedTransactor(key) transactOpts := bind.NewKeyedTransactor(key)
_, blockSigner, err := DeployBlockSigner(transactOpts, contractBackend) blockSignerAddress, blockSigner, err := DeployBlockSigner(transactOpts, contractBackend)
if err != nil { if err != nil {
t.Fatalf("can't deploy root registry: %v", err) t.Fatalf("can't deploy root registry: %v", err)
} }
contractBackend.Commit() contractBackend.Commit()
d := time.Now().Add(1000 * time.Millisecond) d := time.Now().Add(1000 * time.Millisecond)
ctx, _ := context.WithDeadline(context.Background(), d) ctx, cancel := context.WithDeadline(context.Background(), d)
defer cancel()
code, _ := contractBackend.CodeAt(ctx, blockSignerAddress, nil) code, _ := contractBackend.CodeAt(ctx, blockSignerAddress, nil)
t.Log("contract code", common.ToHex(code)) t.Log("contract code", common.ToHex(code))
f := func(key, val common.Hash) bool { f := func(key, val common.Hash) bool {

3
contracts/randomize/randomize_test.go
View file

@ -31,7 +31,8 @@ func TestRandomize(t *testing.T) {
contractBackend.Commit() contractBackend.Commit()
d := time.Now().Add(1000 * time.Millisecond) d := time.Now().Add(1000 * time.Millisecond)
ctx, _ := context.WithDeadline(context.Background(), d) ctx, cancel := context.WithDeadline(context.Background(), d)
defer cancel()
code, _ := contractBackend.CodeAt(ctx, randomizeAddress, nil) code, _ := contractBackend.CodeAt(ctx, randomizeAddress, nil)
t.Log("contract code", common.ToHex(code)) t.Log("contract code", common.ToHex(code))
f := func(key, val common.Hash) bool { f := func(key, val common.Hash) bool {

3
contracts/validator/validator_test.go
View file

@ -40,7 +40,8 @@ func TestValidator(t *testing.T) {
contractBackend.Commit() contractBackend.Commit()
d := time.Now().Add(1000 * time.Millisecond) d := time.Now().Add(1000 * time.Millisecond)
ctx, _ := context.WithDeadline(context.Background(), d) ctx, cancel := context.WithDeadline(context.Background(), d)
defer cancel()
code, _ := contractBackend.CodeAt(ctx, validatorAddress, nil) code, _ := contractBackend.CodeAt(ctx, validatorAddress, nil)
t.Log("contract code", common.ToHex(code)) t.Log("contract code", common.ToHex(code))
f := func(key, val common.Hash) bool { f := func(key, val common.Hash) bool {