resolve file conflict

This commit is contained in:
MestryOmkar 2018-10-26 17:02:28 +05:30
parent dccf2ca3e9
commit e712c2a377

View file

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