cmd, contracts, eth, p2p, signer, whisper: fixed ineffectual assignments (#19869)

Fixed assigning values to variables we don't end up using.
pull/19875/head
Christian Muehlhaeuser 5 years ago committed by Péter Szilágyi
parent 04e175b8ec
commit a32a2b933a
  1. 4
      cmd/clef/main.go
  2. 6
      cmd/geth/retesteth.go
  3. 4
      contracts/checkpointoracle/oracle_test.go
  4. 2
      eth/downloader/downloader.go
  5. 2
      p2p/simulations/adapters/exec.go
  6. 2
      signer/core/signed_data.go
  7. 2
      whisper/mailserver/server_test.go
  8. 2
      whisper/whisperv6/peer.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!"}}` 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))) //_, err := api.SignData(ctx, accounts.MimetypeTypedData, *addr, hexutil.Encode([]byte(data)))
var typedData core.TypedData var typedData core.TypedData
err := json.Unmarshal([]byte(data), &typedData) json.Unmarshal([]byte(data), &typedData)
_, err = api.SignTypedData(ctx, *addr, typedData) _, err := api.SignTypedData(ctx, *addr, typedData)
expectApprove("sign 712 typed data", err) expectApprove("sign 712 typed data", err)
} }
{ // Sign data test - plain text { // Sign data test - plain text

@ -768,10 +768,10 @@ func (api *RetestethAPI) StorageRangeAt(ctx context.Context,
} }
// Ensure any modifications are committed to the state // Ensure any modifications are committed to the state
// Only delete empty objects if EIP158/161 (a.k.a Spurious Dragon) is in effect // 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) { if idx == int(txIndex) {
// This is to make sure root can be opened by OpenTrie // 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 { if err != nil {
return StorageRangeResult{}, err return StorageRangeResult{}, err
} }
@ -832,7 +832,7 @@ func retesteth(ctx *cli.Context) error {
log.Info("Welcome to retesteth!") log.Info("Welcome to retesteth!")
// register signer API with server // register signer API with server
var ( var (
extapiURL = "n/a" extapiURL string
) )
apiImpl := &RetestethAPI{} apiImpl := &RetestethAPI{}
var testApi RetestethTestAPI = apiImpl var testApi RetestethTestAPI = apiImpl

@ -241,9 +241,9 @@ func TestCheckpointRegister(t *testing.T) {
// Test transaction replay protection // Test transaction replay protection
validateOperation(t, c, contractBackend, func() { validateOperation(t, c, contractBackend, func() {
number, hash := getRecent() number, _ := getRecent()
v, r, s := collectSig(0, checkpoint0.Hash(), 2, nil) v, r, s := collectSig(0, checkpoint0.Hash(), 2, nil)
hash = common.HexToHash("deadbeef") hash := common.HexToHash("deadbeef")
c.SetCheckpoint(transactOpts, number, hash, checkpoint0.Hash(), 0, v, r, s) c.SetCheckpoint(transactOpts, number, hash, checkpoint0.Hash(), 0, v, r, s)
}, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error { }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
return assert(0, emptyHash, big.NewInt(0)) return assert(0, emptyHash, big.NewInt(0))

@ -997,7 +997,7 @@ func (d *Downloader) fetchHeaders(p *peerConnection, from uint64, pivot uint64)
// chain errors. // chain errors.
if n := len(headers); n > 0 { if n := len(headers); n > 0 {
// Retrieve the current head we're at // Retrieve the current head we're at
head := uint64(0) var head uint64
if d.mode == LightSync { if d.mode == LightSync {
head = d.lightchain.CurrentHeader().Number.Uint64() head = d.lightchain.CurrentHeader().Number.Uint64()
} else { } else {

@ -416,7 +416,7 @@ func startExecNodeStack() (*node.Node, error) {
} }
// create enode record // create enode record
nodeTcpConn, err := net.ResolveTCPAddr("tcp", conf.Stack.P2P.ListenAddr) nodeTcpConn, _ := net.ResolveTCPAddr("tcp", conf.Stack.P2P.ListenAddr)
if nodeTcpConn.IP == nil { if nodeTcpConn.IP == nil {
nodeTcpConn.IP = net.IPv4(127, 0, 0, 1) nodeTcpConn.IP = net.IPv4(127, 0, 0, 1)
} }

@ -484,7 +484,7 @@ func (typedData *TypedData) EncodeData(primaryType string, data map[string]inter
func parseInteger(encType string, encValue interface{}) (*big.Int, error) { func parseInteger(encType string, encValue interface{}) (*big.Int, error) {
var ( var (
length = 0 length int
signed = strings.HasPrefix(encType, "int") signed = strings.HasPrefix(encType, "int")
b *big.Int b *big.Int
) )

@ -172,7 +172,7 @@ func singleRequest(t *testing.T, server *WMailServer, env *whisper.Envelope, p *
} }
src[0]++ src[0]++
ok, lower, upper, bloom = server.validateRequest(src, request) ok, lower, upper, _ = server.validateRequest(src, request)
if !ok { if !ok {
// request should be valid regardless of signature // request should be valid regardless of signature
t.Fatalf("request validation false negative, seed: %d (lower: %d, upper: %d).", seed, lower, upper) t.Fatalf("request validation false negative, seed: %d (lower: %d, upper: %d).", seed, lower, upper)

@ -130,7 +130,7 @@ func (peer *Peer) handshake() error {
} }
} }
isRemotePeerLightNode, err := s.Bool() isRemotePeerLightNode, _ := s.Bool()
if isRemotePeerLightNode && isLightNode && isRestrictedLightNodeConnection { if isRemotePeerLightNode && isLightNode && isRestrictedLightNodeConnection {
return fmt.Errorf("peer [%x] is useless: two light client communication restricted", peer.ID()) return fmt.Errorf("peer [%x] is useless: two light client communication restricted", peer.ID())
} }

Loading…
Cancel
Save