From d1aa605f1e8639769cdd75bcec3064c29a62b34a Mon Sep 17 00:00:00 2001
From: Wenbiao Zheng <delweng@gmail.com>
Date: Mon, 27 Aug 2018 16:49:29 +0800
Subject: all: remove the duplicate 'the' in annotations (#17509)

---
 accounts/abi/bind/bind.go                   | 4 ++--
 cmd/wnode/main.go                           | 2 +-
 common/bitutil/compress_test.go             | 4 ++--
 console/prompter.go                         | 4 ++--
 core/block_validator.go                     | 2 +-
 core/state_processor.go                     | 2 +-
 core/vm/contract.go                         | 2 +-
 crypto/secp256k1/secp256.go                 | 2 +-
 eth/downloader/queue.go                     | 2 +-
 eth/fetcher/fetcher.go                      | 2 +-
 p2p/server.go                               | 2 +-
 swarm/api/api.go                            | 2 +-
 swarm/network/README.md                     | 2 +-
 swarm/network/stream/intervals/intervals.go | 2 +-
 swarm/network/stream/snapshot_sync_test.go  | 2 +-
 whisper/whisperv5/whisper.go                | 2 +-
 whisper/whisperv6/whisper.go                | 2 +-
 17 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go
index 411177057..172bed8fa 100644
--- a/accounts/abi/bind/bind.go
+++ b/accounts/abi/bind/bind.go
@@ -207,7 +207,7 @@ func bindTypeGo(kind abi.Type) string {
 
 // The inner function of bindTypeGo, this finds the inner type of stringKind.
 // (Or just the type itself if it is not an array or slice)
-// The length of the matched part is returned, with the the translated type.
+// The length of the matched part is returned, with the translated type.
 func bindUnnestedTypeGo(stringKind string) (int, string) {
 
 	switch {
@@ -255,7 +255,7 @@ func bindTypeJava(kind abi.Type) string {
 
 // The inner function of bindTypeJava, this finds the inner type of stringKind.
 // (Or just the type itself if it is not an array or slice)
-// The length of the matched part is returned, with the the translated type.
+// The length of the matched part is returned, with the translated type.
 func bindUnnestedTypeJava(stringKind string) (int, string) {
 
 	switch {
diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go
index 31b65c1da..ae79841f6 100644
--- a/cmd/wnode/main.go
+++ b/cmd/wnode/main.go
@@ -754,7 +754,7 @@ func extractIDFromEnode(s string) []byte {
 	return n.ID[:]
 }
 
-// obfuscateBloom adds 16 random bits to the the bloom
+// obfuscateBloom adds 16 random bits to the bloom
 // filter, in order to obfuscate the containing topics.
 // it does so deterministically within every session.
 // despite additional bits, it will match on average
diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go
index 9bd1de103..13a13011d 100644
--- a/common/bitutil/compress_test.go
+++ b/common/bitutil/compress_test.go
@@ -117,7 +117,7 @@ func TestDecodingCycle(t *testing.T) {
 // TestCompression tests that compression works by returning either the bitset
 // encoded input, or the actual input if the bitset version is longer.
 func TestCompression(t *testing.T) {
-	// Check the the compression returns the bitset encoding is shorter
+	// Check the compression returns the bitset encoding is shorter
 	in := hexutil.MustDecode("0x4912385c0e7b64000000")
 	out := hexutil.MustDecode("0x80fe4912385c0e7b64")
 
@@ -127,7 +127,7 @@ func TestCompression(t *testing.T) {
 	if data, err := DecompressBytes(out, len(in)); err != nil || !bytes.Equal(data, in) {
 		t.Errorf("decoding mismatch for sparse data: have %x, want %x, error %v", data, in, err)
 	}
-	// Check the the compression returns the input if the bitset encoding is longer
+	// Check the compression returns the input if the bitset encoding is longer
 	in = hexutil.MustDecode("0xdf7070533534333636313639343638373532313536346c1bc33339343837313070706336343035336336346c65fefb3930393233383838ac2f65fefb")
 	out = hexutil.MustDecode("0xdf7070533534333636313639343638373532313536346c1bc33339343837313070706336343035336336346c65fefb3930393233383838ac2f65fefb")
 
diff --git a/console/prompter.go b/console/prompter.go
index 9b90034db..29a53aead 100644
--- a/console/prompter.go
+++ b/console/prompter.go
@@ -43,7 +43,7 @@ type UserPrompter interface {
 	// choice to be made, returning that choice.
 	PromptConfirm(prompt string) (bool, error)
 
-	// SetHistory sets the the input scrollback history that the prompter will allow
+	// SetHistory sets the input scrollback history that the prompter will allow
 	// the user to scroll back to.
 	SetHistory(history []string)
 
@@ -149,7 +149,7 @@ func (p *terminalPrompter) PromptConfirm(prompt string) (bool, error) {
 	return false, err
 }
 
-// SetHistory sets the the input scrollback history that the prompter will allow
+// SetHistory sets the input scrollback history that the prompter will allow
 // the user to scroll back to.
 func (p *terminalPrompter) SetHistory(history []string) {
 	p.State.ReadHistory(strings.NewReader(strings.Join(history, "\n")))
diff --git a/core/block_validator.go b/core/block_validator.go
index 98958809b..ecd6a89bc 100644
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -45,7 +45,7 @@ func NewBlockValidator(config *params.ChainConfig, blockchain *BlockChain, engin
 	return validator
 }
 
-// ValidateBody validates the given block's uncles and verifies the the block
+// ValidateBody validates the given block's uncles and verifies the block
 // header's transaction and uncle roots. The headers are assumed to be already
 // validated at this point.
 func (v *BlockValidator) ValidateBody(block *types.Block) error {
diff --git a/core/state_processor.go b/core/state_processor.go
index 8e238ce1f..1a91a57ab 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -61,7 +61,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 		allLogs  []*types.Log
 		gp       = new(GasPool).AddGas(block.GasLimit())
 	)
-	// Mutate the the block and state according to any hard-fork specs
+	// Mutate the block and state according to any hard-fork specs
 	if p.config.DAOForkSupport && p.config.DAOForkBlock != nil && p.config.DAOForkBlock.Cmp(block.Number()) == 0 {
 		misc.ApplyDAOHardFork(statedb)
 	}
diff --git a/core/vm/contract.go b/core/vm/contract.go
index b466681db..26bca6895 100644
--- a/core/vm/contract.go
+++ b/core/vm/contract.go
@@ -40,7 +40,7 @@ type AccountRef common.Address
 func (ar AccountRef) Address() common.Address { return (common.Address)(ar) }
 
 // Contract represents an ethereum contract in the state database. It contains
-// the the contract code, calling arguments. Contract implements ContractRef
+// the contract code, calling arguments. Contract implements ContractRef
 type Contract struct {
 	// CallerAddress is the result of the caller which initialised this
 	// contract. However when the "call method" is delegated this value
diff --git a/crypto/secp256k1/secp256.go b/crypto/secp256k1/secp256.go
index 843fb1252..35d0eef34 100644
--- a/crypto/secp256k1/secp256.go
+++ b/crypto/secp256k1/secp256.go
@@ -86,7 +86,7 @@ func Sign(msg []byte, seckey []byte) ([]byte, error) {
 	return sig, nil
 }
 
-// RecoverPubkey returns the the public key of the signer.
+// RecoverPubkey returns the public key of the signer.
 // msg must be the 32-byte hash of the message to be signed.
 // sig must be a 65-byte compact ECDSA signature containing the
 // recovery id as the last element.
diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
index 984dd13d6..8529535ba 100644
--- a/eth/downloader/queue.go
+++ b/eth/downloader/queue.go
@@ -662,7 +662,7 @@ func (q *queue) expire(timeout time.Duration, pendPool map[string]*fetchRequest,
 			for _, header := range request.Headers {
 				taskQueue.Push(header, -float32(header.Number.Uint64()))
 			}
-			// Add the peer to the expiry report along the the number of failed requests
+			// Add the peer to the expiry report along the number of failed requests
 			expiries[id] = len(request.Headers)
 		}
 	}
diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go
index 6383596dc..277f14b81 100644
--- a/eth/fetcher/fetcher.go
+++ b/eth/fetcher/fetcher.go
@@ -204,7 +204,7 @@ func (f *Fetcher) Notify(peer string, hash common.Hash, number uint64, time time
 	}
 }
 
-// Enqueue tries to fill gaps the the fetcher's future import queue.
+// Enqueue tries to fill gaps the fetcher's future import queue.
 func (f *Fetcher) Enqueue(peer string, block *types.Block) error {
 	op := &inject{
 		origin: peer,
diff --git a/p2p/server.go b/p2p/server.go
index 8f3a511f3..f9a38fcc6 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -77,7 +77,7 @@ type Config struct {
 	// Disabling is useful for protocol debugging (manual topology).
 	NoDiscovery bool
 
-	// DiscoveryV5 specifies whether the the new topic-discovery based V5 discovery
+	// DiscoveryV5 specifies whether the new topic-discovery based V5 discovery
 	// protocol should be started or not.
 	DiscoveryV5 bool `toml:",omitempty"`
 
diff --git a/swarm/api/api.go b/swarm/api/api.go
index adf469cfa..0d08eeea8 100644
--- a/swarm/api/api.go
+++ b/swarm/api/api.go
@@ -153,7 +153,7 @@ func NewMultiResolver(opts ...MultiResolverOption) (m *MultiResolver) {
 
 // Resolve resolves address by choosing a Resolver by TLD.
 // If there are more default Resolvers, or for a specific TLD,
-// the Hash from the the first one which does not return error
+// the Hash from the first one which does not return error
 // will be returned.
 func (m *MultiResolver) Resolve(addr string) (h common.Hash, err error) {
 	rs, err := m.getResolveValidator(addr)
diff --git a/swarm/network/README.md b/swarm/network/README.md
index ad429b38b..e9c9d30d0 100644
--- a/swarm/network/README.md
+++ b/swarm/network/README.md
@@ -133,7 +133,7 @@ As part of the deletion protocol then, hashes of insured chunks to be removed ar
 Downstream peer on the other hand needs to make sure that they can only be finger pointed about a chunk they did receive and store.
 For this the check of a state should be exhaustive. If historical syncing finishes on one state, all hashes before are covered, no
 surprises. In other words historical syncing this process is self verifying. With session syncing however, it is not enough to check going back covering the range from old offset to new. Continuity (i.e., that the new state is extension of the old) needs to be verified: after downstream peer reads the range into a buffer, it appends the buffer the last known state at the last known offset and verifies the resulting hash matches
-the latest state. Past intervals of historical syncing are checked via the the session root.
+the latest state. Past intervals of historical syncing are checked via the session root.
 Upstream peer signs the states, downstream peers can use as handover proofs.
 Downstream  peers sign off on a state together with an initial offset.
 
diff --git a/swarm/network/stream/intervals/intervals.go b/swarm/network/stream/intervals/intervals.go
index 5fd820da8..562c3df9a 100644
--- a/swarm/network/stream/intervals/intervals.go
+++ b/swarm/network/stream/intervals/intervals.go
@@ -101,7 +101,7 @@ func (i *Intervals) add(start, end uint64) {
 	}
 }
 
-// Merge adds all the intervals from the the m Interval to current one.
+// Merge adds all the intervals from the m Interval to current one.
 func (i *Intervals) Merge(m *Intervals) {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
diff --git a/swarm/network/stream/snapshot_sync_test.go b/swarm/network/stream/snapshot_sync_test.go
index 6acab50af..4e1ab09fc 100644
--- a/swarm/network/stream/snapshot_sync_test.go
+++ b/swarm/network/stream/snapshot_sync_test.go
@@ -182,7 +182,7 @@ func testSyncingViaGlobalSync(t *testing.T, chunkCount int, nodeCount int) {
 			conf.addrToIDMap[string(a)] = n
 		}
 
-		//get the the node at that index
+		//get the node at that index
 		//this is the node selected for upload
 		node := sim.RandomUpNode()
 		item, ok := sim.NodeItem(node.ID, bucketKeyStore)
diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go
index 5a2b25c9e..8e0662327 100644
--- a/whisper/whisperv5/whisper.go
+++ b/whisper/whisperv5/whisper.go
@@ -291,7 +291,7 @@ func (w *Whisper) AddKeyPair(key *ecdsa.PrivateKey) (string, error) {
 	return id, nil
 }
 
-// HasKeyPair checks if the the whisper node is configured with the private key
+// HasKeyPair checks if the whisper node is configured with the private key
 // of the specified public pair.
 func (w *Whisper) HasKeyPair(id string) bool {
 	w.keyMu.RLock()
diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go
index 76d485808..34c1256a6 100644
--- a/whisper/whisperv6/whisper.go
+++ b/whisper/whisperv6/whisper.go
@@ -423,7 +423,7 @@ func (whisper *Whisper) AddKeyPair(key *ecdsa.PrivateKey) (string, error) {
 	return id, nil
 }
 
-// HasKeyPair checks if the the whisper node is configured with the private key
+// HasKeyPair checks if the whisper node is configured with the private key
 // of the specified public pair.
 func (whisper *Whisper) HasKeyPair(id string) bool {
 	whisper.keyMu.RLock()
-- 
cgit v1.2.3