use context deadline for timeout in eth_call

i-norden · i-norden · commit 7c0492a20442 · 2020-10-12T10:20:21.000-05:00
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -879,7 +879,12 @@ func (s *PublicBlockChainAPI) Call(ctx context.Context, args CallArgs, blockNrOr
 	if overrides != nil {
 		accounts = *overrides
 	}
-	result, _, _, err := DoCall(ctx, s.b, args, blockNrOrHash, accounts, vm.Config{}, 5*time.Second, s.b.RPCGasCap())
+	timeout := 5 * time.Second
+	d, ok := ctx.Deadline()
+	if ok {
+		timeout = d.Sub(time.Now())
+	}
+	result, _, _, err := DoCall(ctx, s.b, args, blockNrOrHash, accounts, vm.Config{}, timeout, s.b.RPCGasCap())
 	return (hexutil.Bytes)(result), err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -879,7 +879,12 @@ func (s *PublicBlockChainAPI) Call(ctx context.Context, args CallArgs, blockNrOr`
`879`	`879`	`if overrides != nil {`
`880`	`880`	`accounts = *overrides`
`881`	`881`	`}`
`882`		`- result, _, _, err := DoCall(ctx, s.b, args, blockNrOrHash, accounts, vm.Config{}, 5*time.Second, s.b.RPCGasCap())`
	`882`	`+ timeout := 5 * time.Second`
	`883`	`+ d, ok := ctx.Deadline()`
	`884`	`+ if ok {`
	`885`	`+ timeout = d.Sub(time.Now())`
	`886`	`+ }`
	`887`	`+ result, _, _, err := DoCall(ctx, s.b, args, blockNrOrHash, accounts, vm.Config{}, timeout, s.b.RPCGasCap())`
`883`	`888`	`return (hexutil.Bytes)(result), err`
`884`	`889`	`}`
`885`	`890`