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

resolve file conflict

Browse source
This commit is contained in:
MestryOmkar 2018-10-26 17:02:28 +05:30
parent dccf2ca3e9
commit e712c2a377
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contracts/utils_test.go
View file

@ -35,7 +35,7 @@ func TestSendTxSign(t *testing.T) {
ctx := context.Background() ctx := context.Background()
transactOpts := bind.NewKeyedTransactor(acc1Key) transactOpts := bind.NewKeyedTransactor(acc1Key)
blockSignerAddr, blockSigner, err := blocksigner.DeployBlockSigner(transactOpts, backend) blockSignerAddr, blockSigner, err := blocksigner.DeployBlockSigner(transactOpts, backend, big.NewInt(99))
if err != nil { if err != nil {
t.Fatalf("Can't get block signer: %v", err) t.Fatalf("Can't get block signer: %v", err)
} }