From a32a2b933ad6793a2fe4172cd46c5c5906da259a Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 22 Jul 2019 12:34:41 +0200 Subject: cmd, contracts, eth, p2p, signer, whisper: fixed ineffectual assignments (#19869) Fixed assigning values to variables we don't end up using. --- cmd/clef/main.go | 4 ++-- cmd/geth/retesteth.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/clef/main.go b/cmd/clef/main.go index f4d94f027..85ec5647c 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -767,8 +767,8 @@ func testExternalUI(api *core.SignerAPI) { data := `{"types":{"EIP712Domain":[{"name":"name","type":"string"},{"name":"version","type":"string"},{"name":"chainId","type":"uint256"},{"name":"verifyingContract","type":"address"}],"Person":[{"name":"name","type":"string"},{"name":"test","type":"uint8"},{"name":"wallet","type":"address"}],"Mail":[{"name":"from","type":"Person"},{"name":"to","type":"Person"},{"name":"contents","type":"string"}]},"primaryType":"Mail","domain":{"name":"Ether Mail","version":"1","chainId":"1","verifyingContract":"0xCCCcccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"},"message":{"from":{"name":"Cow","test":"3","wallet":"0xcD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"},"to":{"name":"Bob","wallet":"0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB","test":"2"},"contents":"Hello, Bob!"}}` //_, err := api.SignData(ctx, accounts.MimetypeTypedData, *addr, hexutil.Encode([]byte(data))) var typedData core.TypedData - err := json.Unmarshal([]byte(data), &typedData) - _, err = api.SignTypedData(ctx, *addr, typedData) + json.Unmarshal([]byte(data), &typedData) + _, err := api.SignTypedData(ctx, *addr, typedData) expectApprove("sign 712 typed data", err) } { // Sign data test - plain text diff --git a/cmd/geth/retesteth.go b/cmd/geth/retesteth.go index 8453f753f..f20f2295a 100644 --- a/cmd/geth/retesteth.go +++ b/cmd/geth/retesteth.go @@ -768,10 +768,10 @@ func (api *RetestethAPI) StorageRangeAt(ctx context.Context, } // Ensure any modifications are committed to the state // Only delete empty objects if EIP158/161 (a.k.a Spurious Dragon) is in effect - root = statedb.IntermediateRoot(vmenv.ChainConfig().IsEIP158(block.Number())) + _ = statedb.IntermediateRoot(vmenv.ChainConfig().IsEIP158(block.Number())) if idx == int(txIndex) { // This is to make sure root can be opened by OpenTrie - root, err = statedb.Commit(vmenv.ChainConfig().IsEIP158(block.Number())) + _, err = statedb.Commit(vmenv.ChainConfig().IsEIP158(block.Number())) if err != nil { return StorageRangeResult{}, err } @@ -832,7 +832,7 @@ func retesteth(ctx *cli.Context) error { log.Info("Welcome to retesteth!") // register signer API with server var ( - extapiURL = "n/a" + extapiURL string ) apiImpl := &RetestethAPI{} var testApi RetestethTestAPI = apiImpl -- cgit v1.2.3