aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-01-10 05:53:17 +0800
committerGitHub <noreply@github.com>2017-01-10 05:53:17 +0800
commit02b67558e8eaa7b34a28b8dd0223824bbbb52349 (patch)
tree33bbc5057d4546d93d6d0e92b90eef19b49abb83 /core
parent91c8f87fb128c070b6c557a142e25d4428c96487 (diff)
parentb9b3efb09f9281a5859646d2dcf36b5813132efb (diff)
downloaddexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar
dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.gz
dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.bz2
dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.lz
dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.xz
dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.zst
dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.zip
Merge pull request #3535 from fjl/all-ineffassign
all: fix ineffectual assignments
Diffstat (limited to 'core')
-rw-r--r--core/blockchain.go3
-rw-r--r--core/state/managed_state_test.go8
2 files changed, 5 insertions, 6 deletions
diff --git a/core/blockchain.go b/core/blockchain.go
index c3530b93c..8eb7de982 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1054,11 +1054,10 @@ func (st *insertStats) report(chain []*types.Block, index int) {
start, end := chain[st.lastIndex], chain[index]
txcount := countTransactions(chain[st.lastIndex : index+1])
- extra := ""
+ var hashes, extra string
if st.queued > 0 || st.ignored > 0 {
extra = fmt.Sprintf(" (%d queued %d ignored)", st.queued, st.ignored)
}
- hashes := ""
if st.processed > 1 {
hashes = fmt.Sprintf("%x… / %x…", start.Hash().Bytes()[:4], end.Hash().Bytes()[:4])
} else {
diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go
index d9c232ebb..0a3be9f5a 100644
--- a/core/state/managed_state_test.go
+++ b/core/state/managed_state_test.go
@@ -88,12 +88,12 @@ func TestRemoteNonceChange(t *testing.T) {
nn[i] = true
}
account.nonces = append(account.nonces, nn...)
- nonce := ms.NewNonce(addr)
+ ms.NewNonce(addr)
ms.StateDB.stateObjects[addr].data.Nonce = 200
- nonce = ms.NewNonce(addr)
+ nonce := ms.NewNonce(addr)
if nonce != 200 {
- t.Error("expected nonce after remote update to be", 201, "got", nonce)
+ t.Error("expected nonce after remote update to be", 200, "got", nonce)
}
ms.NewNonce(addr)
ms.NewNonce(addr)
@@ -101,7 +101,7 @@ func TestRemoteNonceChange(t *testing.T) {
ms.StateDB.stateObjects[addr].data.Nonce = 200
nonce = ms.NewNonce(addr)
if nonce != 204 {
- t.Error("expected nonce after remote update to be", 201, "got", nonce)
+ t.Error("expected nonce after remote update to be", 204, "got", nonce)
}
}