Skip to content
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.

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

refactor(core-state): wallet manager indexes #2845

Merged
merged 7 commits into from
Jul 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 __tests__/unit/core-database/database-service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ describe("Database Service", () => {
// Necessary for revertRound to not blow up.
// @ts-ignore
walletManager.allByUsername = jest.fn(() => {
const usernames = Object.values((walletManager as any).byUsername);
const usernames = walletManager.getIndex(State.WalletIndexes.Usernames).all() as any;
usernames.push(sender);
return usernames;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ describe("Transactions Business Repository", () => {

it("should lookup senders address from senderId", async () => {
databaseService.walletManager = {
has: addressOrPublicKey => true,
hasByAddress: addressOrPublicKey => true,
findByAddress: address => ({ publicKey: "pubKey" }),
} as State.IWalletManager;

Expand Down Expand Up @@ -179,10 +179,12 @@ describe("Transactions Business Repository", () => {
}));

databaseService.walletManager = {
has: addressOrPublicKey => false,
hasByAddress: addressOrPublicKey => false,
hasByPublicKey: addressOrPublicKey => false,
} as State.IWalletManager;

jest.spyOn(databaseService.walletManager, "has").mockReturnValue(false);
jest.spyOn(databaseService.walletManager, "hasByAddress").mockReturnValue(false);
jest.spyOn(databaseService.walletManager, "hasByPublicKey").mockReturnValue(false);

await transactionsBusinessRepository.search({
addresses: ["addy1", "addy2"],
Expand All @@ -205,8 +207,8 @@ describe("Transactions Business Repository", () => {
]),
}),
);
expect(databaseService.walletManager.has).toHaveBeenNthCalledWith(1, "addy1");
expect(databaseService.walletManager.has).toHaveBeenNthCalledWith(2, "addy2");
expect(databaseService.walletManager.hasByAddress).toHaveBeenNthCalledWith(1, "addy1");
expect(databaseService.walletManager.hasByAddress).toHaveBeenNthCalledWith(2, "addy2");
});

it("should cache blocks if cache-miss ", async () => {
Expand Down
32 changes: 32 additions & 0 deletions __tests__/unit/core-state/wallets/wallet-index.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { State } from "@arkecosystem/core-interfaces";
import { Wallet } from "../../../../packages/core-state/src/wallets";
import { WalletIndex } from "../../../../packages/core-state/src/wallets/wallet-index";
import wallets from "../__fixtures__/wallets.json";

const walletData1 = wallets[0];

describe("WalletIndex", () => {
it("should be ok", () => {
const wallet = new Wallet(walletData1.address);
const walletIndex = new WalletIndex((index: State.IWalletIndex, wallet: State.IWallet) => {
index.set(wallet.address, wallet);
});

expect(walletIndex.has(walletData1.address)).toBeFalse();

walletIndex.index(wallet);
expect(walletIndex.has(walletData1.address)).toBeTrue();

walletIndex.forget(walletData1.address);
expect(walletIndex.has(walletData1.address)).toBeFalse();

walletIndex.set(walletData1.address, wallet);
expect(walletIndex.get(walletData1.address)).toBe(wallet);
expect(walletIndex.has(walletData1.address)).toBeTrue();

expect(walletIndex.all()).toContain(wallet);

walletIndex.clear();
expect(walletIndex.has(walletData1.address)).toBeFalse();
});
});
Loading