Merge pull request #941 from ellemouton/sql4Accounts4

[sql-4] accounts: remove last usages of `UpdateAccount`

accounts/interface.go

@@ -207,11 +207,6 @@ type Store interface {
 		expirationDate time.Time, label string) (
 		*OffChainBalanceAccount, error)
 
-	// UpdateAccount writes an account to the database, overwriting the
-	// existing one if it exists.
-	UpdateAccount(ctx context.Context,
-		account *OffChainBalanceAccount) error
-
 	// Account retrieves an account from the Store and un-marshals it. If
 	// the account cannot be found, then ErrAccNotFound is returned.
 	Account(ctx context.Context, id AccountID) (*OffChainBalanceAccount,
@@ -223,7 +218,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.