accounts: revert UpdateAccountBalanceAndExpiry balance type to be int64

In our mission to replace UpdateAccount, we need
UpdatAccountBalanceAndExpiry to take a negative balance so that we can
use it to replace the behaviour of UpdateAccount as it stands today.

Author: ellemouton

accounts/interface.go

@@ -223,7 +223,7 @@ type Store interface {
 	// UpdateAccountBalanceAndExpiry updates the balance and/or expiry of an
 	// account.
 	UpdateAccountBalanceAndExpiry(ctx context.Context, id AccountID,
-		newBalance fn.Option[lnwire.MilliSatoshi],
+		newBalance fn.Option[int64],
 		newExpiry fn.Option[time.Time]) error
 
 	// AddAccountInvoice adds an invoice hash to an account.

accounts/service.go

@@ -328,10 +328,10 @@ func (s *InterceptorService) UpdateAccount(ctx context.Context,
 
 	// If the new account balance was set, parse it as millisatoshis. A
 	// value of -1 signals "don't update the balance".
-	var balance fn.Option[lnwire.MilliSatoshi]
+	var balance fn.Option[int64]
 	if accountBalance >= 0 {
 		// Convert from satoshis to millisatoshis for storage.
-		balance = fn.Some(lnwire.MilliSatoshi(accountBalance) * 1000)
+		balance = fn.Some(int64(accountBalance) * 1000)
 	}
 
 	// Create the actual account in the macaroon account store.

accounts/store_kvdb.go

@@ -203,12 +203,12 @@ func (s *BoltStore) UpdateAccount(_ context.Context,
 //
 // NOTE: This is part of the Store interface.
 func (s *BoltStore) UpdateAccountBalanceAndExpiry(_ context.Context,
-	id AccountID, newBalance fn.Option[lnwire.MilliSatoshi],
+	id AccountID, newBalance fn.Option[int64],
 	newExpiry fn.Option[time.Time]) error {
 
 	update := func(account *OffChainBalanceAccount) error {
-		newBalance.WhenSome(func(balance lnwire.MilliSatoshi) {
-			account.CurrentBalance = int64(balance)
+		newBalance.WhenSome(func(balance int64) {
+			account.CurrentBalance = balance
 		})
 		newExpiry.WhenSome(func(expiry time.Time) {
 			account.ExpirationDate = expiry

accounts/store_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/lightningnetwork/lnd/fn"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
-	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/stretchr/testify/require"
 )
 
@@ -119,15 +118,15 @@ func TestAccountUpdateMethods(t *testing.T) {
 		// Ensure that the function errors out if we try update an
 		// account that does not exist.
 		err := store.UpdateAccountBalanceAndExpiry(
-			ctx, AccountID{}, fn.None[lnwire.MilliSatoshi](),
+			ctx, AccountID{}, fn.None[int64](),
 			fn.None[time.Time](),
 		)
 		require.ErrorIs(t, err, ErrAccNotFound)
 
 		acct, err := store.NewAccount(ctx, 0, time.Time{}, "foo")
 		require.NoError(t, err)
 
-		assertBalanceAndExpiry := func(balance lnwire.MilliSatoshi,
+		assertBalanceAndExpiry := func(balance int64,
 			expiry time.Time) {
 
 			dbAcct, err := store.Account(ctx, acct.ID)
@@ -143,7 +142,7 @@ func TestAccountUpdateMethods(t *testing.T) {
 		assertBalanceAndExpiry(0, time.Time{})
 
 		// Now, update just the balance of the account.
-		newBalance := lnwire.MilliSatoshi(123)
+		newBalance := int64(123)
 		err = store.UpdateAccountBalanceAndExpiry(
 			ctx, acct.ID, fn.Some(newBalance), fn.None[time.Time](),
 		)
@@ -153,8 +152,7 @@ func TestAccountUpdateMethods(t *testing.T) {
 		// Now update just the expiry of the account.
 		newExpiry := time.Now().Add(time.Hour)
 		err = store.UpdateAccountBalanceAndExpiry(
-			ctx, acct.ID, fn.None[lnwire.MilliSatoshi](),
-			fn.Some(newExpiry),
+			ctx, acct.ID, fn.None[int64](), fn.Some(newExpiry),
 		)
 		require.NoError(t, err)
 		assertBalanceAndExpiry(newBalance, newExpiry)
@@ -171,8 +169,7 @@ func TestAccountUpdateMethods(t *testing.T) {
 		// Finally, test an update that has no net changes to the
 		// balance or expiry.
 		err = store.UpdateAccountBalanceAndExpiry(
-			ctx, acct.ID, fn.None[lnwire.MilliSatoshi](),
-			fn.None[time.Time](),
+			ctx, acct.ID, fn.None[int64](), fn.None[time.Time](),
 		)
 		require.NoError(t, err)
 		assertBalanceAndExpiry(newBalance, newExpiry)