aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmd/geth/main.go2
-rw-r--r--cmd/puppeth/module_dashboard.go2
-rw-r--r--cmd/puppeth/module_explorer.go2
-rw-r--r--cmd/puppeth/module_faucet.go6
-rw-r--r--cmd/puppeth/module_node.go2
-rw-r--r--console/bridge.go2
-rw-r--r--core/bloombits/matcher.go2
-rw-r--r--eth/downloader/api.go2
-rw-r--r--eth/fetcher/fetcher_test.go2
-rw-r--r--internal/jsre/deps/web3.js2
-rw-r--r--mobile/types.go16
-rw-r--r--node/config.go2
-rw-r--r--rpc/doc.go2
-rw-r--r--swarm/network/kademlia/address.go2
14 files changed, 23 insertions, 23 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index d94154245..d6a004c7a 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -241,7 +241,7 @@ func startNode(ctx *cli.Context, stack *node.Node) {
stack.AccountManager().Subscribe(events)
go func() {
- // Create an chain state reader for self-derivation
+ // Create a chain state reader for self-derivation
rpcClient, err := stack.Attach()
if err != nil {
utils.Fatalf("Failed to attach to self: %v", err)
diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go
index 3832b247f..4f9e88899 100644
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@@ -683,7 +683,7 @@ func deployDashboard(client *sshClient, network string, conf *config, config *da
return nil, client.Stream(fmt.Sprintf("cd %s && docker-compose -p %s up -d --build --force-recreate", workdir, network))
}
-// dashboardInfos is returned from an dashboard status check to allow reporting
+// dashboardInfos is returned from a dashboard status check to allow reporting
// various configuration parameters.
type dashboardInfos struct {
host string
diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go
index 427134153..bb43e5fe4 100644
--- a/cmd/puppeth/module_explorer.go
+++ b/cmd/puppeth/module_explorer.go
@@ -168,7 +168,7 @@ func (info *explorerInfos) Report() map[string]string {
return report
}
-// checkExplorer does a health-check against an block explorer server to verify
+// checkExplorer does a health-check against a block explorer server to verify
// whether it's running, and if yes, whether it's responsive.
func checkExplorer(client *sshClient, network string) (*explorerInfos, error) {
// Inspect a possible block explorer container on the host
diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go
index 976bf04d0..8365bf47d 100644
--- a/cmd/puppeth/module_faucet.go
+++ b/cmd/puppeth/module_faucet.go
@@ -30,7 +30,7 @@ import (
"github.com/ethereum/go-ethereum/log"
)
-// faucetDockerfile is the Dockerfile required to build an faucet container to
+// faucetDockerfile is the Dockerfile required to build a faucet container to
// grant crypto tokens based on GitHub authentications.
var faucetDockerfile = `
FROM ethereum/client-go:alltools-latest
@@ -138,7 +138,7 @@ func deployFaucet(client *sshClient, network string, bootnodes []string, config
return nil, client.Stream(fmt.Sprintf("cd %s && docker-compose -p %s up -d --build --force-recreate", workdir, network))
}
-// faucetInfos is returned from an faucet status check to allow reporting various
+// faucetInfos is returned from a faucet status check to allow reporting various
// configuration parameters.
type faucetInfos struct {
node *nodeInfos
@@ -181,7 +181,7 @@ func (info *faucetInfos) Report() map[string]string {
return report
}
-// checkFaucet does a health-check against an faucet server to verify whether
+// checkFaucet does a health-check against a faucet server to verify whether
// it's running, and if yes, gathering a collection of useful infos about it.
func checkFaucet(client *sshClient, network string) (*faucetInfos, error) {
// Inspect a possible faucet container on the host
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go
index 49c099112..3c70dbb4f 100644
--- a/cmd/puppeth/module_node.go
+++ b/cmd/puppeth/module_node.go
@@ -198,7 +198,7 @@ func (info *nodeInfos) Report() map[string]string {
return report
}
-// checkNode does a health-check against an boot or seal node server to verify
+// checkNode does a health-check against a boot or seal node server to verify
// whether it's running, and if yes, whether it's responsive.
func checkNode(client *sshClient, network string, boot bool) (*nodeInfos, error) {
kind := "bootnode"
diff --git a/console/bridge.go b/console/bridge.go
index b28cc438e..f2120351c 100644
--- a/console/bridge.go
+++ b/console/bridge.go
@@ -87,7 +87,7 @@ func (b *bridge) NewAccount(call otto.FunctionCall) (response otto.Value) {
// OpenWallet is a wrapper around personal.openWallet which can interpret and
// react to certain error messages, such as the Trezor PIN matrix request.
func (b *bridge) OpenWallet(call otto.FunctionCall) (response otto.Value) {
- // Make sure we have an wallet specified to open
+ // Make sure we have a wallet specified to open
if !call.Argument(0).IsString() {
throwJSException("first argument must be the wallet URL to open")
}
diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go
index ce3031702..8d78adb75 100644
--- a/core/bloombits/matcher.go
+++ b/core/bloombits/matcher.go
@@ -392,7 +392,7 @@ func (m *Matcher) distributor(dist chan *request, session *MatcherSession) {
shutdown = session.quit // Shutdown request channel, will gracefully wait for pending requests
)
- // assign is a helper method fo try to assign a pending bit an an actively
+ // assign is a helper method fo try to assign a pending bit an actively
// listening servicer, or schedule it up for later when one arrives.
assign := func(bit uint) {
select {
diff --git a/eth/downloader/api.go b/eth/downloader/api.go
index d496fa6a4..91c6322d4 100644
--- a/eth/downloader/api.go
+++ b/eth/downloader/api.go
@@ -51,7 +51,7 @@ func NewPublicDownloaderAPI(d *Downloader, m *event.TypeMux) *PublicDownloaderAP
return api
}
-// eventLoop runs an loop until the event mux closes. It will install and uninstall new
+// eventLoop runs a loop until the event mux closes. It will install and uninstall new
// sync subscriptions and broadcasts sync status updates to the installed sync subscriptions.
func (api *PublicDownloaderAPI) eventLoop() {
var (
diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go
index 9d53b98b6..1e536fcac 100644
--- a/eth/fetcher/fetcher_test.go
+++ b/eth/fetcher/fetcher_test.go
@@ -198,7 +198,7 @@ func (f *fetcherTester) makeBodyFetcher(peer string, blocks map[common.Hash]*typ
}
}
-// verifyFetchingEvent verifies that one single event arrive on an fetching channel.
+// verifyFetchingEvent verifies that one single event arrive on a fetching channel.
func verifyFetchingEvent(t *testing.T, fetching chan []common.Hash, arrive bool) {
if arrive {
select {
diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js
index 9bb899384..abd4b4fe5 100644
--- a/internal/jsre/deps/web3.js
+++ b/internal/jsre/deps/web3.js
@@ -2193,7 +2193,7 @@ var toWei = function(number, unit) {
};
/**
- * Takes an input and transforms it into an bignumber
+ * Takes an input and transforms it into a bignumber
*
* @method toBigNumber
* @param {Number|String|BigNumber} a number, string, HEX string or BigNumber
diff --git a/mobile/types.go b/mobile/types.go
index 24cd7ebf1..196c7839f 100644
--- a/mobile/types.go
+++ b/mobile/types.go
@@ -80,7 +80,7 @@ func (h *Header) EncodeRLP() ([]byte, error) {
return rlp.EncodeToBytes(h.header)
}
-// NewHeaderFromJSON parses a header from an JSON data dump.
+// NewHeaderFromJSON parses a header from a JSON data dump.
func NewHeaderFromJSON(data string) (*Header, error) {
h := &Header{
header: new(types.Header),
@@ -91,7 +91,7 @@ func NewHeaderFromJSON(data string) (*Header, error) {
return h, nil
}
-// EncodeJSON encodes a header into an JSON data dump.
+// EncodeJSON encodes a header into a JSON data dump.
func (h *Header) EncodeJSON() (string, error) {
data, err := json.Marshal(h.header)
return string(data), err
@@ -151,7 +151,7 @@ func (b *Block) EncodeRLP() ([]byte, error) {
return rlp.EncodeToBytes(b.block)
}
-// NewBlockFromJSON parses a block from an JSON data dump.
+// NewBlockFromJSON parses a block from a JSON data dump.
func NewBlockFromJSON(data string) (*Block, error) {
b := &Block{
block: new(types.Block),
@@ -162,7 +162,7 @@ func NewBlockFromJSON(data string) (*Block, error) {
return b, nil
}
-// EncodeJSON encodes a block into an JSON data dump.
+// EncodeJSON encodes a block into a JSON data dump.
func (b *Block) EncodeJSON() (string, error) {
data, err := json.Marshal(b.block)
return string(data), err
@@ -220,7 +220,7 @@ func (tx *Transaction) EncodeRLP() ([]byte, error) {
return rlp.EncodeToBytes(tx.tx)
}
-// NewTransactionFromJSON parses a transaction from an JSON data dump.
+// NewTransactionFromJSON parses a transaction from a JSON data dump.
func NewTransactionFromJSON(data string) (*Transaction, error) {
tx := &Transaction{
tx: new(types.Transaction),
@@ -231,7 +231,7 @@ func NewTransactionFromJSON(data string) (*Transaction, error) {
return tx, nil
}
-// EncodeJSON encodes a transaction into an JSON data dump.
+// EncodeJSON encodes a transaction into a JSON data dump.
func (tx *Transaction) EncodeJSON() (string, error) {
data, err := json.Marshal(tx.tx)
return string(data), err
@@ -312,7 +312,7 @@ func (r *Receipt) EncodeRLP() ([]byte, error) {
return rlp.EncodeToBytes(r.receipt)
}
-// NewReceiptFromJSON parses a transaction receipt from an JSON data dump.
+// NewReceiptFromJSON parses a transaction receipt from a JSON data dump.
func NewReceiptFromJSON(data string) (*Receipt, error) {
r := &Receipt{
receipt: new(types.Receipt),
@@ -323,7 +323,7 @@ func NewReceiptFromJSON(data string) (*Receipt, error) {
return r, nil
}
-// EncodeJSON encodes a transaction receipt into an JSON data dump.
+// EncodeJSON encodes a transaction receipt into a JSON data dump.
func (r *Receipt) EncodeJSON() (string, error) {
data, err := rlp.EncodeToBytes(r.receipt)
return string(data), err
diff --git a/node/config.go b/node/config.go
index dda24583e..486eddf92 100644
--- a/node/config.go
+++ b/node/config.go
@@ -209,7 +209,7 @@ func DefaultHTTPEndpoint() string {
return config.HTTPEndpoint()
}
-// WSEndpoint resolves an websocket endpoint based on the configured host interface
+// WSEndpoint resolves a websocket endpoint based on the configured host interface
// and port parameters.
func (c *Config) WSEndpoint() string {
if c.WSHost == "" {
diff --git a/rpc/doc.go b/rpc/doc.go
index 14b3780ad..78aa92f89 100644
--- a/rpc/doc.go
+++ b/rpc/doc.go
@@ -92,7 +92,7 @@ An example method:
Subscriptions are deleted when:
- the user sends an unsubscribe request
- the connection which was used to create the subscription is closed. This can be initiated
- by the client and server. The server will close the connection on an write error or when
+ by the client and server. The server will close the connection on a write error or when
the queue of buffered notifications gets too big.
*/
package rpc
diff --git a/swarm/network/kademlia/address.go b/swarm/network/kademlia/address.go
index 4c38a846f..ef82d2e8b 100644
--- a/swarm/network/kademlia/address.go
+++ b/swarm/network/kademlia/address.go
@@ -51,7 +51,7 @@ func (a Address) Bin() string {
/*
Proximity(x, y) returns the proximity order of the MSB distance between x and y
-The distance metric MSB(x, y) of two equal length byte sequences x an y is the
+The distance metric MSB(x, y) of two equal length byte sequences x and y is the
value of the binary integer cast of the x^y, ie., x and y bitwise xor-ed.
the binary cast is big endian: most significant bit first (=MSB).