diff --git a/lnd.go b/lnd.go index a080f5a7..3e6ed885 100644 --- a/lnd.go +++ b/lnd.go @@ -118,7 +118,7 @@ func AdminAuthOptions() ([]grpc.DialOption, error) { return opts, nil } -// ListnerWithSignal is a net.Listner that has an additional Ready channel that +// ListenerWithSignal is a net.Listener that has an additional Ready channel that // will be closed when a server starts listening. type ListenerWithSignal struct { net.Listener diff --git a/lnwallet/chanfunding/assembler.go b/lnwallet/chanfunding/assembler.go index e320d9ee..d06de903 100644 --- a/lnwallet/chanfunding/assembler.go +++ b/lnwallet/chanfunding/assembler.go @@ -27,7 +27,7 @@ type CoinSource interface { type CoinSelectionLocker interface { // WithCoinSelectLock will execute the passed function closure in a // synchronized manner preventing any coin selection operations from - // proceeding while the closure if executing. This can be seen as the + // proceeding while the closure is executing. This can be seen as the // ability to execute a function closure under an exclusive coin // selection lock. WithCoinSelectLock(func() error) error diff --git a/lnwallet/wallet.go b/lnwallet/wallet.go index 73eaf217..dbada608 100644 --- a/lnwallet/wallet.go +++ b/lnwallet/wallet.go @@ -1435,7 +1435,7 @@ func (l *LightningWallet) handleSingleFunderSigs(req *addSingleFunderSigsMsg) { // WithCoinSelectLock will execute the passed function closure in a // synchronized manner preventing any coin selection operations from proceeding -// while the closure if executing. This can be seen as the ability to execute a +// while the closure is executing. This can be seen as the ability to execute a // function closure under an exclusive coin selection lock. func (l *LightningWallet) WithCoinSelectLock(f func() error) error { l.coinSelectMtx.Lock() diff --git a/sweep/interface.go b/sweep/interface.go index 948d8ddf..a9ff82cc 100644 --- a/sweep/interface.go +++ b/sweep/interface.go @@ -20,7 +20,7 @@ type Wallet interface { // WithCoinSelectLock will execute the passed function closure in a // synchronized manner preventing any coin selection operations from - // proceeding while the closure if executing. This can be seen as the + // proceeding while the closure is executing. This can be seen as the // ability to execute a function closure under an exclusive coin // selection lock. WithCoinSelectLock(f func() error) error diff --git a/sweep/store_test.go b/sweep/store_test.go index 6853c7bb..29456558 100644 --- a/sweep/store_test.go +++ b/sweep/store_test.go @@ -141,7 +141,7 @@ func testStore(t *testing.T, createStore func() (SweeperStore, error)) { t.Fatal("expected tx to be ours") } - // An different hash should be reported on as not being ours. + // An different hash should be reported as not being ours. var unknownHash chainhash.Hash ours, err = store.IsOurTx(unknownHash) if err != nil { diff --git a/sweep/sweeper.go b/sweep/sweeper.go index 59971493..eb88aef4 100644 --- a/sweep/sweeper.go +++ b/sweep/sweeper.go @@ -57,7 +57,7 @@ var ( // ErrSweeperShuttingDown is an error returned when a client attempts to // make a request to the UtxoSweeper, but it is unable to handle it as - // it is/has already been stoppepd. + // it is/has already been stopped. ErrSweeperShuttingDown = errors.New("utxo sweeper shutting down") // DefaultMaxSweepAttempts specifies the default maximum number of times @@ -422,7 +422,7 @@ func (s *UtxoSweeper) SweepInput(input input.Input, resultChan: make(chan Result, 1), } - // Deliver input to main event loop. + // Deliver input to the main event loop. select { case s.newInputs <- sweeperInput: case <-s.quit: @@ -449,7 +449,7 @@ func (s *UtxoSweeper) feeRateForPreference( } if feeRate < s.relayFeeRate { return 0, fmt.Errorf("fee preference resulted in invalid fee "+ - "rate %v, mininum is %v", feeRate, s.relayFeeRate) + "rate %v, minimum is %v", feeRate, s.relayFeeRate) } if feeRate > s.cfg.MaxFeeRate { return 0, fmt.Errorf("fee preference resulted in invalid fee "+ @@ -478,7 +478,7 @@ func (s *UtxoSweeper) collector(blockEpochs <-chan *chainntnfs.BlockEpoch) { select { // A new inputs is offered to the sweeper. We check to see if we // are already trying to sweep this input and if not, set up a - // listener for spend and schedule a sweep. + // listener to spend and schedule a sweep. case input := <-s.newInputs: outpoint := *input.input.OutPoint() pendInput, pending := s.pendingInputs[outpoint] @@ -534,7 +534,7 @@ func (s *UtxoSweeper) collector(blockEpochs <-chan *chainntnfs.BlockEpoch) { s.testSpendChan <- *spend.SpentOutPoint } - // Query store to find out if we every published this + // Query store to find out if we ever published this // tx. spendHash := *spend.SpenderTxHash isOurTx, err := s.cfg.Store.IsOurTx(spendHash) diff --git a/sweep/sweeper_test.go b/sweep/sweeper_test.go index 85908f7e..dbbb0dc6 100644 --- a/sweep/sweeper_test.go +++ b/sweep/sweeper_test.go @@ -760,7 +760,7 @@ func TestRestart(t *testing.T) { // Expect last tx to be republished. ctx.receiveTx() - // Simulate other subsystem (eg contract resolver) re-offering inputs. + // Simulate other subsystem (e.g. contract resolver) re-offering inputs. spendChan1, err := ctx.sweeper.SweepInput(input1, defaultFeePref) if err != nil { t.Fatal(err) @@ -858,7 +858,7 @@ func TestRestartRemoteSpend(t *testing.T) { // Mine remote spending tx. ctx.backend.mine() - // Simulate other subsystem (eg contract resolver) re-offering input 0. + // Simulate other subsystem (e.g. contract resolver) re-offering input 0. spendChan, err := ctx.sweeper.SweepInput(input1, defaultFeePref) if err != nil { t.Fatal(err) @@ -901,7 +901,7 @@ func TestRestartConfirmed(t *testing.T) { // Mine the sweep tx. ctx.backend.mine() - // Simulate other subsystem (eg contract resolver) re-offering input 0. + // Simulate other subsystem (e.g. contract resolver) re-offering input 0. spendChan, err := ctx.sweeper.SweepInput(input, defaultFeePref) if err != nil { t.Fatal(err) diff --git a/sweep/test_utils.go b/sweep/test_utils.go index df44cd10..6b9b0d72 100644 --- a/sweep/test_utils.go +++ b/sweep/test_utils.go @@ -216,7 +216,7 @@ func (m *MockNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, m.mutex.Unlock() // If output has been spent already, signal now. Do this outside the - // lock to prevent a dead lock. + // lock to prevent a deadlock. if spent { m.sendSpend(channel, outpoint, spendingTx) } diff --git a/sweep/walletsweep.go b/sweep/walletsweep.go index 38d19488..fb25ccf3 100644 --- a/sweep/walletsweep.go +++ b/sweep/walletsweep.go @@ -112,7 +112,7 @@ type UtxoSource interface { type CoinSelectionLocker interface { // WithCoinSelectLock will execute the passed function closure in a // synchronized manner preventing any coin selection operations from - // proceeding while the closure if executing. This can be seen as the + // proceeding while the closure is executing. This can be seen as the // ability to execute a function closure under an exclusive coin // selection lock. WithCoinSelectLock(func() error) error @@ -120,7 +120,7 @@ type CoinSelectionLocker interface { // OutpointLocker allows a caller to lock/unlock an outpoint. When locked, the // outpoints shouldn't be used for any sort of channel funding of coin -// selection. Locked outpoints are not expect to be persisted between restarts. +// selection. Locked outpoints are not expected to be persisted between restarts. type OutpointLocker interface { // LockOutpoint locks a target outpoint, rendering it unusable for coin // selection.