LBRYCommunity/wallet-sync-server
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases 2 Packages Wiki Activity

Clear up what ErrNoWallet means

Browse source
This commit is contained in:
Daniel Krol 2022-07-11 10:41:18 -04:00
parent 2e0eb736f9
commit 7833015f56
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
store/password_test.go
View file

@ -85,7 +85,8 @@ func TestStoreChangePasswordErrors(t *testing.T) {
emailSuffix: auth.Email(""), // the email is correct
oldPasswordSuffix: auth.Password(""), // the password is correct
// Maybe ErrNoWallet once we sort it out. See TODO item by its definition.
// Sequence=1 always ends up being wrong for this endpoint since we
// should never be creating a wallet here.
expectedError: ErrWrongSequence,
},
}

11
store/store.go
View file

@ -21,10 +21,7 @@ var (
ErrDuplicateWallet = fmt.Errorf("Wallet already exists for this user")
// TODO - the use of this error message is a bit confusing. The phrasing is
// not correct for GetWallet. And maybe the other uses probably should just
// return ErrWrongSequence to begin with. But think about it.
ErrNoWallet = fmt.Errorf("Wallet does not exist for this user at this sequence")
ErrNoWallet = fmt.Errorf("Wallet does not exist for this user")
ErrUnexpectedWallet = fmt.Errorf("Wallet unexpectedly exist for this user")
ErrWrongSequence = fmt.Errorf("Wallet could not be updated to this sequence")
@ -263,6 +260,8 @@ func (s *Store) insertFirstWallet(
// I initially expected to need to check for ErrConstraintUnique.
// Maybe for psql it will be?
if errors.Is(sqliteErr.ExtendedCode, sqlite3.ErrConstraintPrimaryKey) {
// NOTE While ErrDuplicateWallet makes sense in the context of trying to insert,
// SetWallet, which also handles update, translates this to ErrWrongSequence
err = ErrDuplicateWallet
}
}
@ -279,7 +278,7 @@ func (s *Store) updateWalletToSequence(
// This will be used for wallets with sequence > 1.
// Use the database to enforce that we only update if we are incrementing the sequence.
// This way, if two clients attempt to update at the same time, it will return
// ErrNoWallet for the second one.
// an error for the second one.
res, err := s.db.Exec(
"UPDATE wallets SET encrypted_wallet=?, sequence=?, hmac=? WHERE user_id=? AND sequence=?",
encryptedWallet, sequence, hmac, userId, sequence-1,
@ -293,6 +292,8 @@ func (s *Store) updateWalletToSequence(
return
}
if numRows == 0 {
// NOTE While ErrNoWallet makes sense in the context of trying to update,
// SetWallet, which also handles insert, translates this to ErrWrongSequence
err = ErrNoWallet
}
return