Fix a-vs-an typos

MzaFPCkw · Feb 8, 2018 · 4f4756b · 4f4756b
1 parent 5474512
commit 4f4756b
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 25 deletions.
diff --git a/bitcoin/script.c b/bitcoin/script.c
@@ -512,7 +512,7 @@ u8 **bitcoin_to_local_spend_revocation(const tal_t *ctx,
  *
  * #### Offered HTLC Outputs
  *
- * This output sends funds to a HTLC-timeout transaction after the HTLC
+ * This output sends funds to an HTLC-timeout transaction after the HTLC
  * timeout, or to the remote peer using the payment preimage or the revocation
  * key.  The output is a P2WSH, with a witness script:
  *

diff --git a/channeld/channel_wire.csv b/channeld/channel_wire.csv
@@ -84,7 +84,7 @@ channel_offer_htlc_reply,,failure_code,u16
 channel_offer_htlc_reply,,failurestrlen,u16
 channel_offer_htlc_reply,,failurestr,failurestrlen*u8
 
-# Main daemon found out the preimage for an htlc
+# Main daemon found out the preimage for an HTLC
 #include <bitcoin/preimage.h>
 channel_fulfill_htlc,1005
 channel_fulfill_htlc,,id,u64

diff --git a/common/htlc_state.h b/common/htlc_state.h
@@ -14,7 +14,7 @@ enum htlc_state {
 	RCVD_ADD_ACK_COMMIT,
 	SENT_ADD_ACK_REVOCATION,
 
-	/* When they remove an htlc, it goes from SENT_ADD_ACK_REVOCATION: */
+	/* When they remove an HTLC, it goes from SENT_ADD_ACK_REVOCATION: */
 	RCVD_REMOVE_HTLC,
 	RCVD_REMOVE_COMMIT,
 	SENT_REMOVE_REVOCATION,
@@ -28,7 +28,7 @@ enum htlc_state {
 	SENT_ADD_ACK_COMMIT,
 	RCVD_ADD_ACK_REVOCATION,
 
-	/* When we remove an htlc, it goes from RCVD_ADD_ACK_REVOCATION: */
+	/* When we remove an HTLC, it goes from RCVD_ADD_ACK_REVOCATION: */
 	SENT_REMOVE_HTLC,
 	SENT_REMOVE_COMMIT,
 	RCVD_REMOVE_REVOCATION,

diff --git a/doc/lightning-pay.7 b/doc/lightning-pay.7
@@ -94,7 +94,7 @@ using different amount or destination\&.
 .\}
 202\&. Unparseable onion reply\&. The
 \fIdata\fR
-field of the error will have a
+field of the error will have an
 \fIonionreply\fR
 field, a hex string representation of the raw onion reply\&.
 .RE

diff --git a/doc/lightning-pay.7.txt b/doc/lightning-pay.7.txt
@@ -42,7 +42,7 @@ The following error codes may occur:
 * 201. Already paid with this 'hash' using different amount or
   destination.
 * 202. Unparseable onion reply. The 'data' field of the error
-  will have a 'onionreply' field, a hex string representation
+  will have an 'onionreply' field, a hex string representation
   of the raw onion reply.
 * 203. Permanent failure at destination. The 'data' field of
   the error will be routing failure object.

diff --git a/doc/lightning-sendpay.7 b/doc/lightning-sendpay.7
@@ -96,7 +96,7 @@ using different amount or destination\&.
 .\}
 202\&. Unparseable onion reply\&. The
 \fIdata\fR
-field of the error will have a
+field of the error will have an
 \fIonionreply\fR
 field, a hex string representation of the raw onion reply\&.
 .RE

diff --git a/doc/lightning-sendpay.7.txt b/doc/lightning-sendpay.7.txt
@@ -43,7 +43,7 @@ The following error codes may occur:
 * 201. Already paid with this 'hash' using different amount or
   destination.
 * 202. Unparseable onion reply. The 'data' field of the error
-  will have a 'onionreply' field, a hex string representation
+  will have an 'onionreply' field, a hex string representation
   of the raw onion reply.
 * 203. Permanent failure at destination. The 'data' field of
   the error will be routing failure object.

diff --git a/lightningd/netaddress.c b/lightningd/netaddress.c
@@ -228,7 +228,7 @@ static bool get_local_sockname(struct lightningd *ld,
     return true;
 }
 
-/* Return an wireaddr without port filled in */
+/* Return a wireaddr without port filled in */
 static bool guess_one_address(struct lightningd *ld,
                               struct wireaddr *addr, u16 portnum,
                               enum wire_addr_type type)

diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
@@ -1275,7 +1275,7 @@ static void handle_irrevocably_resolved(struct peer *peer, const u8 *msg)
 }
 
 /**
- * onchain_add_utxo -- onchaind is telling us about a UTXO we own
+ * onchain_add_utxo -- onchaind is telling us about an UTXO we own
  */
 static void onchain_add_utxo(struct peer *peer, const u8 *msg)
 {

diff --git a/onchaind/onchain.c b/onchaind/onchain.c
@@ -520,7 +520,7 @@ static void handle_htlc_onchain_fulfill(struct tracked_output *out,
 	struct sha256 sha;
 	struct ripemd160 ripemd;
 
-	/* Our HTLC, they filled (must be a HTLC-success tx). */
+	/* Our HTLC, they filled (must be an HTLC-success tx). */
 	if (out->tx_type == THEIR_UNILATERAL) {
 		/* BOLT #3:
 		 *

diff --git a/onchaind/onchain_wire.csv b/onchaind/onchain_wire.csv
@@ -82,7 +82,7 @@ onchain_htlc_timeout,,htlc,struct htlc_stub
 # onchaind->master: this peer can be forgotten
 onchain_all_irrevocably_resolved,5011
 
-# onchaind->master: hey, I identified a UTXO you'll want to track
+# onchaind->master: hey, I identified an UTXO you'll want to track
 onchain_add_utxo,5012
 onchain_add_utxo,,prev_out_tx,struct bitcoin_txid
 onchain_add_utxo,,prev_out_index,u32

diff --git a/onchaind/onchain_wire.h b/onchaind/onchain_wire.h
@@ -5,7 +5,7 @@
 #include <ccan/tal/tal.h>
 #include <common/htlc.h>
 
-/* The minimal info about an htlc. */
+/* The minimal info about an HTLC. */
 struct htlc_stub {
 	enum side owner;
 	u32 cltv_expiry;

diff --git a/test/test_protocol.c b/test/test_protocol.c
@@ -88,7 +88,7 @@ enum htlc_state {
 	RECV_ADD_ACK_COMMIT = RECV_ADD_REVOCATION + LOCAL(COMMITTED),
 	SENT_ADD_ACK_REVOCATION = RECV_ADD_ACK_COMMIT + LOCAL(REVOKED) - ADDING,
 
-	/* When they remove an htlc, it goes from SENT_ADD_ACK_REVOCATION: */
+	/* When they remove an HTLC, it goes from SENT_ADD_ACK_REVOCATION: */
 	RECV_REMOVE_HTLC = REMOVING + OURS + LOCAL(PENDING)
 				+ LOCAL(COMMITTED) + REMOTE(COMMITTED),
 	RECV_REMOVE_COMMIT = RECV_REMOVE_HTLC - LOCAL(PENDING) - LOCAL(COMMITTED),
@@ -103,7 +103,7 @@ enum htlc_state {
 	SENT_ADD_ACK_COMMIT = SENT_ADD_REVOCATION + REMOTE(COMMITTED),
 	RECV_ADD_ACK_REVOCATION = SENT_ADD_ACK_COMMIT + REMOTE(REVOKED),
 
-	/* When we remove an htlc, it goes from RECV_ADD_ACK_REVOCATION: */
+	/* When we remove an HTLC, it goes from RECV_ADD_ACK_REVOCATION: */
 	SENT_REMOVE_HTLC = REMOVING + THEIRS + REMOTE(PENDING)
 				+ LOCAL(COMMITTED) + REMOTE(COMMITTED),
 	SENT_REMOVE_COMMIT = SENT_REMOVE_HTLC - REMOTE(PENDING) - REMOTE(COMMITTED),
@@ -168,7 +168,7 @@ static const char *htlc_stateflags(const tal_t *ctx, enum htlc_state state)
 
 struct htlc {
 	enum htlc_state state;
-	/* 0 means this is actually a new fee, not a HTLC. */
+	/* 0 means this is actually a new fee, not an HTLC. */
 	unsigned int id;
 };
 

diff --git a/test/test_state_coverage.c b/test/test_state_coverage.c
@@ -898,15 +898,15 @@ const struct bitcoin_tx *bitcoin_commit(const tal_t *ctx, struct peer *peer)
 	return bitcoin_tx("our commit");
 }
 
-/* Create a HTLC refund collection */
+/* Create an HTLC refund collection */
 const struct bitcoin_tx *bitcoin_htlc_timeout(const tal_t *ctx,
 					      const struct peer *peer,
 					      const struct htlc *htlc)
 {
 	return htlc_tx(ctx, "htlc timeout", htlc->id);
 }
 
-/* Create a HTLC collection */
+/* Create an HTLC collection */
 const struct bitcoin_tx *bitcoin_htlc_spend(const tal_t *ctx,
 					    const struct peer *peer,
 					    const struct htlc *htlc)

diff --git a/tests/test_lightningd.py b/tests/test_lightningd.py
@@ -2008,7 +2008,7 @@ def test_forward_different_fees_and_cltv(self):
         assert route[0]['delay'] == 9 + shadow_route
 
         # BOLT #7:
-        # If A were to send an 4,999,999 millisatoshi to C via B, it needs to
+        # If A were to send 4,999,999 millisatoshi to C via B, it needs to
         # pay B the fee it specified in the B->C `channel_update`, calculated as
         # per [HTLC Fees](#htlc_fees):
         #

diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
@@ -162,7 +162,7 @@ static bool test_wallet_outputs(void)
 	CHECK_MSG(!wallet_add_utxo(w, &u, p2sh_wpkh),
 		  "wallet_add_utxo succeeded on second add");
 
-	/* Attempt to save a utxo with close_info set */
+	/* Attempt to save an UTXO with close_info set */
 	memset(&u.txid, 1, sizeof(u.txid));
 	u.close_info = tal(w, struct unilateral_close_info);
 	u.close_info->channel_id = 42;

diff --git a/wallet/wallet.c b/wallet/wallet.c
@@ -54,7 +54,7 @@ bool wallet_add_utxo(struct wallet *w, struct utxo *utxo,
 }
 
 /**
- * wallet_stmt2output - Extract data from stmt and fill a utxo
+ * wallet_stmt2output - Extract data from stmt and fill an UTXO
  *
  * Returns true on success.
  */

diff --git a/wallet/wallet.h b/wallet/wallet.h
@@ -115,9 +115,9 @@ struct wallet *wallet_new(const tal_t *ctx,
 			  struct log *log, struct timers *timers);
 
 /**
- * wallet_add_utxo - Register a UTXO which we (partially) own
+ * wallet_add_utxo - Register an UTXO which we (partially) own
  *
- * Add a UTXO to the set of outputs we care about.
+ * Add an UTXO to the set of outputs we care about.
  */
 bool wallet_add_utxo(struct wallet *w, struct utxo *utxo,
 		     enum wallet_output_type type);
@@ -280,7 +280,7 @@ int wallet_extract_owned_outputs(struct wallet *w, const struct bitcoin_tx *tx,
 				 u64 *total_satoshi);
 
 /**
- * wallet_htlc_save_in - store a htlc_in in the database
+ * wallet_htlc_save_in - store an htlc_in in the database
  *
  * @wallet: wallet to store the htlc into
  * @chan: the `wallet_channel` this HTLC is associated with
@@ -298,7 +298,7 @@ void wallet_htlc_save_in(struct wallet *wallet,
 			 const struct wallet_channel *chan, struct htlc_in *in);
 
 /**
- * wallet_htlc_save_out - store a htlc_out in the database
+ * wallet_htlc_save_out - store an htlc_out in the database
  *
  * See comment for wallet_htlc_save_in.
  */
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     /**
-     * onchain_add_utxo -- onchaind is telling us about a UTXO we own
+     * onchain_add_utxo -- onchaind is telling us about an UTXO we own
      */
     static void onchain_add_utxo(struct peer *peer, const u8 *msg)
     {
@@ Expand Down @@