From e712c2a377360d6fd721999dc59fb9918244ddc5 Mon Sep 17 00:00:00 2001 From: MestryOmkar Date: Fri, 26 Oct 2018 17:02:28 +0530 Subject: [PATCH] resolve file conflict --- contracts/utils_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/utils_test.go b/contracts/utils_test.go index a391a9ed6e..3ec96eb46c 100644 --- a/contracts/utils_test.go +++ b/contracts/utils_test.go @@ -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) }