Skip to content

fix(core-state): create new wallet instance in WalletRepositoryCopyOnWrite #4694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastijankuzner merged 2 commits into from
Aug 8, 2022
Merged

fix(core-state): create new wallet instance in WalletRepositoryCopyOnWrite #4694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50ee810
create new wallet if cannot clone
sebastijankuzner Aug 3, 2022
05bf9a4
fix tests
sebastijankuzner Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core-state/__tests__/wallets/wallet-repository-copy-on-write.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe("Wallet Repository Copy On Write", () => {
it("should find wallets by address", () => {
const spyFindByAddress = jest.spyOn(walletRepo, "findByAddress");
const clonedWallet = walletRepoCopyOnWrite.findByAddress("notexisting");
expect(spyFindByAddress).toHaveBeenCalledWith("notexisting");
expect(spyFindByAddress).not.toBeCalled();
const originalWallet = walletRepo.findByAddress(clonedWallet.getAddress());
expect(originalWallet).not.toBe(clonedWallet);
});
Expand Down
9 changes: 8 additions & 1 deletion packages/core-state/src/wallets/wallet-repository-copy-on-write.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ export class WalletRepositoryCopyOnWrite extends WalletRepository {

public findByAddress(address: string): Contracts.State.Wallet {
if (address && !this.hasByAddress(address)) {
this.cloneWallet(this.blockchainWalletRepository, this.blockchainWalletRepository.findByAddress(address));
if (this.blockchainWalletRepository.hasByAddress(address)) {
this.cloneWallet(
this.blockchainWalletRepository,
this.blockchainWalletRepository.findByAddress(address),
);
} else {
super.findByAddress(address);
}
}
return this.findByIndex(Contracts.State.WalletIndexes.Addresses, address)!;
}
Expand Down