diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-14 17:35:49 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-14 17:36:12 +0800 |
| commit | 47a801455966298d1d1519eebb955024c8f02b84 (patch) | |
| tree | 5b8144ba4844092dc0bae599fc3314eaacf1a7b4 /internal | |
| parent | 19982f946735948478b6b7e7706f1b615f171d0d (diff) | |
| parent | 3654aeaa4f87452ac5bc801a18808189595e2ef8 (diff) | |
| download | go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.gz go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.bz2 go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.lz go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.xz go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.zst go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.zip | |
cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Fix a conflict in cmd/swarm envVarsOverride function.
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/ethapi/api.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 025f42617..fe0ed8170 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1071,7 +1071,7 @@ type SendTxArgs struct { Nonce *hexutil.Uint64 `json:"nonce"` } -// prepareSendTxArgs is a helper function that fills in default values for unspecified tx fields. +// setDefaults is a helper function that fills in default values for unspecified tx fields. func (args *SendTxArgs) setDefaults(ctx context.Context, b Backend) error { if args.Gas == nil { args.Gas = (*hexutil.Big)(big.NewInt(defaultGas)) |