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

Fix merge conflict with release 1.8

Browse source
This commit is contained in:
Said Syakin 2018-04-04 20:10:01 +04:00
parent dad61ee521
commit f9935d247b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/ethapi/api.go
View file

@ -776,7 +776,7 @@ func (s *PublicBlockChainAPI) GetVarFR(ctx context.Context, args FRGetArgs, bloc
args.Data = packed 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) err = abi.Unpack(&ev, "getVar", result)
@ -863,7 +863,7 @@ func (s *PublicBlockChainAPI) GetVerificatorsCount(ctx context.Context, args Cal
args.Data = packed 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) err = abi.Unpack(&ev, "getVerificatorsCount", result)
@ -894,7 +894,7 @@ func (s *PublicBlockChainAPI) GetVerificatorsIndex(ctx context.Context, args Cal
args.Data = packed 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) err = abi.Unpack(&ev, "getVerificatorsIndex", result)
@ -926,7 +926,7 @@ func (s *PublicBlockChainAPI) GetVerificatorAtIndex(ctx context.Context, args FR
args.Data = packed 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) err = abi.Unpack(&ev, "getVerificatorAtIndex", result)