From f9935d247b42a468562b2f0427f52425ec5301a3 Mon Sep 17 00:00:00 2001 From: Said Syakin Date: Wed, 4 Apr 2018 20:10:01 +0400 Subject: [PATCH] Fix merge conflict with release 1.8 --- internal/ethapi/api.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 8b226f4ba0..a1ca3ec14e 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -776,7 +776,7 @@ func (s *PublicBlockChainAPI) GetVarFR(ctx context.Context, args FRGetArgs, bloc args.Data = packed } - result, _, _, err := s.doCall(ctx, args.CallArgs, blockNr, vm.Config{DisableGasMetering: true}) + result, _, _, err := s.doCall(ctx, args.CallArgs, blockNr, vm.Config{}, 5*time.Second) err = abi.Unpack(&ev, "getVar", result) @@ -863,7 +863,7 @@ func (s *PublicBlockChainAPI) GetVerificatorsCount(ctx context.Context, args Cal args.Data = packed } - result, _, _, err := s.doCall(ctx, args, blockNr, vm.Config{DisableGasMetering: true}) + result, _, _, err := s.doCall(ctx, args, blockNr, vm.Config{}, 5*time.Second) err = abi.Unpack(&ev, "getVerificatorsCount", result) @@ -894,7 +894,7 @@ func (s *PublicBlockChainAPI) GetVerificatorsIndex(ctx context.Context, args Cal args.Data = packed } - result, _, _, err := s.doCall(ctx, args, blockNr, vm.Config{DisableGasMetering: true}) + result, _, _, err := s.doCall(ctx, args, blockNr, vm.Config{}, 5*time.Second) err = abi.Unpack(&ev, "getVerificatorsIndex", result) @@ -926,7 +926,7 @@ func (s *PublicBlockChainAPI) GetVerificatorAtIndex(ctx context.Context, args FR args.Data = packed } - result, _, _, err := s.doCall(ctx, args.CallArgs, blockNr, vm.Config{DisableGasMetering: true}) + result, _, _, err := s.doCall(ctx, args.CallArgs, blockNr, vm.Config{}, 5*time.Second) err = abi.Unpack(&ev, "getVerificatorAtIndex", result)