diff --git a/__tests__/integration/core-api/handlers/peers.test.ts b/__tests__/integration/core-api/handlers/peers.test.ts index 612f5b2e3d..e24f891466 100644 --- a/__tests__/integration/core-api/handlers/peers.test.ts +++ b/__tests__/integration/core-api/handlers/peers.test.ts @@ -45,7 +45,7 @@ beforeAll(async () => { for (const peerMock of Object.values(peerMocks)) { // @ts-ignore - app.get(Container.Identifiers.PeerStorage).setPeer(peerMock); + app.get(Container.Identifiers.PeerRepository).setPeer(peerMock); } }); diff --git a/__tests__/integration/core-state/__support__/setup.ts b/__tests__/integration/core-state/__support__/setup.ts index b382387aec..d8435ca265 100644 --- a/__tests__/integration/core-state/__support__/setup.ts +++ b/__tests__/integration/core-state/__support__/setup.ts @@ -10,7 +10,7 @@ const peerNetworkMonitor = { boot: jest.fn(), cleansePeers: jest.fn(), }; -const peerStorage = null; +const peerRepository = null; export const setUp = async (): Promise => { jest.setTimeout(60000); @@ -45,7 +45,7 @@ export const setUp = async (): Promise => { app.bind(Container.Identifiers.TransactionPoolQuery).toConstantValue(transactionPoolQuery); app.bind(Container.Identifiers.TransactionPoolService).toConstantValue(transactionPoolService); app.bind(Container.Identifiers.PeerNetworkMonitor).toConstantValue(peerNetworkMonitor); - app.bind(Container.Identifiers.PeerStorage).toConstantValue(peerStorage); + app.bind(Container.Identifiers.PeerRepository).toConstantValue(peerRepository); await app.bootstrap({ flags: { diff --git a/__tests__/unit/core-api/__support__/app.ts b/__tests__/unit/core-api/__support__/app.ts index b4a8e2b000..03df37bfd3 100644 --- a/__tests__/unit/core-api/__support__/app.ts +++ b/__tests__/unit/core-api/__support__/app.ts @@ -69,7 +69,7 @@ export const initApp = (): Application => { app.bind(Container.Identifiers.PeerNetworkMonitor).toConstantValue(Mocks.NetworkMonitor.instance); - app.bind(Container.Identifiers.PeerStorage).toConstantValue(Mocks.PeerStorage.instance); + app.bind(Container.Identifiers.PeerRepository).toConstantValue(Mocks.PeerRepository.instance); app.bind(Container.Identifiers.DatabaseRoundRepository).toConstantValue(Mocks.RoundRepository.instance); diff --git a/__tests__/unit/core-api/controllers/peers.test.ts b/__tests__/unit/core-api/controllers/peers.test.ts index 095eb8d09a..3a1030781c 100644 --- a/__tests__/unit/core-api/controllers/peers.test.ts +++ b/__tests__/unit/core-api/controllers/peers.test.ts @@ -23,7 +23,7 @@ beforeEach(() => { controller = app.resolve(PeersController); - Mocks.PeerStorage.setPeers([]); + Mocks.PeerRepository.setPeers([]); }); afterEach(() => { @@ -77,7 +77,7 @@ describe("PeersController", () => { describe("index", () => { it("should return list of peers", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -101,7 +101,7 @@ describe("PeersController", () => { }); it("should return list of peers if version in request is not set", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -137,7 +137,7 @@ describe("PeersController", () => { }); it("should return error when offset is negative", async () => { - Mocks.PeerStorage.setPeers([peer]); + Mocks.PeerRepository.setPeers([peer]); const request: Hapi.Request = { query: { @@ -157,7 +157,7 @@ describe("PeersController", () => { }); it("should return paginated response when offset is not a number", async () => { - Mocks.PeerStorage.setPeers([peer]); + Mocks.PeerRepository.setPeers([peer]); const request: Hapi.Request = { query: { @@ -177,7 +177,7 @@ describe("PeersController", () => { }); it("should return paginated response when limit is not defined", async () => { - Mocks.PeerStorage.setPeers([peer]); + Mocks.PeerRepository.setPeers([peer]); const request: Hapi.Request = { query: { @@ -196,7 +196,7 @@ describe("PeersController", () => { }); it("should return list of peers ordered by version ascending", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -226,7 +226,7 @@ describe("PeersController", () => { }); it("should return list of peers ordered by version descending", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -256,7 +256,7 @@ describe("PeersController", () => { }); it("should return list of peers ordered by height ascending", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -286,7 +286,7 @@ describe("PeersController", () => { }); it("should return list of peers ordered by height descending", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -316,7 +316,7 @@ describe("PeersController", () => { }); it("should return list of peers ordered by latency ascending", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -346,7 +346,7 @@ describe("PeersController", () => { }); it("should return list of peers ordered by latency descending", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -376,7 +376,7 @@ describe("PeersController", () => { }); it("should return list of peers ordered by other descending", async () => { - Mocks.PeerStorage.setPeers([peer, anotherPeer]); + Mocks.PeerRepository.setPeers([peer, anotherPeer]); const request: Hapi.Request = { query: { @@ -408,7 +408,7 @@ describe("PeersController", () => { describe("show", () => { it("should return peer", async () => { - Mocks.PeerStorage.setPeers([peer]); + Mocks.PeerRepository.setPeers([peer]); const request: Hapi.Request = { params: { diff --git a/__tests__/unit/core-api/service-provider.test.ts b/__tests__/unit/core-api/service-provider.test.ts index d57fdc878a..c29a7ee909 100644 --- a/__tests__/unit/core-api/service-provider.test.ts +++ b/__tests__/unit/core-api/service-provider.test.ts @@ -33,7 +33,7 @@ beforeEach(() => { app.bind(Container.Identifiers.PeerNetworkMonitor).toConstantValue({}); - app.bind(Container.Identifiers.PeerStorage).toConstantValue({}); + app.bind(Container.Identifiers.PeerRepository).toConstantValue({}); app.bind(Container.Identifiers.DatabaseRoundRepository).toConstantValue({}); diff --git a/__tests__/unit/core-blockchain/blockchain.test.ts b/__tests__/unit/core-blockchain/blockchain.test.ts index a43c90348f..9bdc80ad61 100644 --- a/__tests__/unit/core-blockchain/blockchain.test.ts +++ b/__tests__/unit/core-blockchain/blockchain.test.ts @@ -24,7 +24,7 @@ describe("Blockchain", () => { const stateMachine: any = {}; const eventDispatcherService: any = {}; const peerNetworkMonitor: any = {}; - const peerStorage: any = {}; + const peerRepository: any = {}; const blockProcessor: any = {}; const databaseInteractions: any = {}; @@ -41,7 +41,7 @@ describe("Blockchain", () => { sandbox.app.bind(Container.Identifiers.StateMachine).toConstantValue(stateMachine); sandbox.app.bind(Container.Identifiers.EventDispatcherService).toConstantValue(eventDispatcherService); sandbox.app.bind(Container.Identifiers.PeerNetworkMonitor).toConstantValue(peerNetworkMonitor); - sandbox.app.bind(Container.Identifiers.PeerStorage).toConstantValue(peerStorage); + sandbox.app.bind(Container.Identifiers.PeerRepository).toConstantValue(peerRepository); sandbox.app.bind(Container.Identifiers.BlockchainService).to(Blockchain).inSingletonScope(); sandbox.app.bind(Container.Identifiers.BlockProcessor).toConstantValue(blockProcessor); sandbox.app.bind(Container.Identifiers.DatabaseTransactionRepository).toConstantValue({}); @@ -112,7 +112,7 @@ describe("Blockchain", () => { peerNetworkMonitor.broadcastBlock = jest.fn(); peerNetworkMonitor.checkNetworkHealth = jest.fn(); - peerStorage.hasPeers = jest.fn(); + peerRepository.hasPeers = jest.fn(); blockProcessor.process = jest.fn(); @@ -756,7 +756,7 @@ describe("Blockchain", () => { it("should return true if we have no peer", () => { const blockchain = sandbox.app.resolve(Blockchain); - peerStorage.hasPeers = jest.fn().mockReturnValue(false); + peerRepository.hasPeers = jest.fn().mockReturnValue(false); expect(blockchain.isSynced()).toBeTrue(); }); @@ -764,7 +764,7 @@ describe("Blockchain", () => { it("should return true if last block is less than 3 blocktimes away from current slot time", () => { const blockchain = sandbox.app.resolve(Blockchain); - peerStorage.hasPeers = jest.fn().mockReturnValue(true); + peerRepository.hasPeers = jest.fn().mockReturnValue(true); const mockBlock = { data: { id: "123", height: 444, timestamp: Crypto.Slots.getTime() - 16 } }; stateStore.getLastBlock = jest.fn().mockReturnValue(mockBlock); @@ -774,7 +774,7 @@ describe("Blockchain", () => { it("should return false if last block is more than 3 blocktimes away from current slot time", () => { const blockchain = sandbox.app.resolve(Blockchain); - peerStorage.hasPeers = jest.fn().mockReturnValue(true); + peerRepository.hasPeers = jest.fn().mockReturnValue(true); const mockBlock = { data: { id: "123", height: 444, timestamp: Crypto.Slots.getTime() - 25 } }; stateStore.getLastBlock = jest.fn().mockReturnValue(mockBlock); diff --git a/__tests__/unit/core-magistrate-api/__support__/index.ts b/__tests__/unit/core-magistrate-api/__support__/index.ts index a16c73a448..143c2fd928 100644 --- a/__tests__/unit/core-magistrate-api/__support__/index.ts +++ b/__tests__/unit/core-magistrate-api/__support__/index.ts @@ -59,7 +59,7 @@ export const initApp = (): Application => { app.bind(Container.Identifiers.DatabaseTransactionRepository).toConstantValue({}); app.bind(Container.Identifiers.DatabaseRoundRepository).toConstantValue({}); app.bind(Container.Identifiers.PeerNetworkMonitor).toConstantValue({}); - app.bind(Container.Identifiers.PeerStorage).toConstantValue({}); + app.bind(Container.Identifiers.PeerRepository).toConstantValue({}); app.bind(Container.Identifiers.TransactionPoolQuery).toConstantValue({}); app.bind(Container.Identifiers.TransactionPoolProcessorFactory).toConstantValue({}); app.bind(Container.Identifiers.TransactionHistoryService).toConstantValue({}); diff --git a/__tests__/unit/core-magistrate-api/service-provider.test.ts b/__tests__/unit/core-magistrate-api/service-provider.test.ts index cc6eec97d0..8770160ebd 100644 --- a/__tests__/unit/core-magistrate-api/service-provider.test.ts +++ b/__tests__/unit/core-magistrate-api/service-provider.test.ts @@ -24,7 +24,7 @@ beforeEach(() => { app.bind(Container.Identifiers.PeerNetworkMonitor).toConstantValue({}); - app.bind(Container.Identifiers.PeerStorage).toConstantValue({}); + app.bind(Container.Identifiers.PeerRepository).toConstantValue({}); app.bind(Container.Identifiers.DatabaseRoundRepository).toConstantValue({}); diff --git a/__tests__/unit/core-p2p/listeners.test.ts b/__tests__/unit/core-p2p/listeners.test.ts index fdd50ba619..b5a5b3e528 100644 --- a/__tests__/unit/core-p2p/listeners.test.ts +++ b/__tests__/unit/core-p2p/listeners.test.ts @@ -8,7 +8,7 @@ describe("DisconnectInvalidPeers", () => { const container = new Container.Container(); const logger = { warning: jest.fn(), debug: jest.fn() }; - const storage = { getPeers: jest.fn() }; + const repository = { getPeers: jest.fn() }; const app = { getTagged: () => ({ getOptional: () => ["^3.0.0", "^3.0.0-next.0"], // minimumVersions @@ -19,7 +19,7 @@ describe("DisconnectInvalidPeers", () => { beforeAll(() => { container.unbindAll(); container.bind(Container.Identifiers.LogService).toConstantValue(logger); - container.bind(Container.Identifiers.PeerStorage).toConstantValue(storage); + container.bind(Container.Identifiers.PeerRepository).toConstantValue(repository); container.bind(Container.Identifiers.Application).toConstantValue(app); container.bind(Container.Identifiers.EventDispatcherService).toConstantValue(emitter); }); @@ -38,10 +38,10 @@ describe("DisconnectInvalidPeers", () => { peers[4].version = "3.0.1"; // valid beforeEach(() => { disconnectInvalidPeers = container.resolve(DisconnectInvalidPeers); - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); }); afterEach(() => { - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); describe("handle", () => { @@ -59,13 +59,13 @@ describe("DisconnectPeer", () => { const container = new Container.Container(); const logger = { warning: jest.fn(), debug: jest.fn() }; - const storage = { forgetPeer: jest.fn() }; + const repository = { forgetPeer: jest.fn() }; const connector = { disconnect: jest.fn() }; beforeAll(() => { container.unbindAll(); container.bind(Container.Identifiers.LogService).toConstantValue(logger); - container.bind(Container.Identifiers.PeerStorage).toConstantValue(storage); + container.bind(Container.Identifiers.PeerRepository).toConstantValue(repository); container.bind(Container.Identifiers.PeerConnector).toConstantValue(connector); }); @@ -78,8 +78,8 @@ describe("DisconnectPeer", () => { const peer = new Peer("187.176.1.1", 4000); await disconnectPeer.handle({ data: { peer: peer, port: 4000 } }); - expect(storage.forgetPeer).toBeCalledTimes(1); - expect(storage.forgetPeer).toBeCalledWith(peer); + expect(repository.forgetPeer).toBeCalledTimes(1); + expect(repository.forgetPeer).toBeCalledWith(peer); expect(connector.disconnect).toBeCalledTimes(1); expect(connector.disconnect).toBeCalledWith(peer); }); diff --git a/__tests__/unit/core-p2p/network-monitor.test.ts b/__tests__/unit/core-p2p/network-monitor.test.ts index 70ae5b67d8..242a5200cb 100644 --- a/__tests__/unit/core-p2p/network-monitor.test.ts +++ b/__tests__/unit/core-p2p/network-monitor.test.ts @@ -37,7 +37,7 @@ describe("NetworkMonitor", () => { postBlock: jest.fn(), pingPorts: jest.fn(), }; - const storage = { getPeers: jest.fn(), forgetPeer: jest.fn() }; + const repository = { getPeers: jest.fn(), forgetPeer: jest.fn() }; const triggerService = { call: jest.fn() }; // validateAndAcceptPeer const stateStore = { getLastBlock: jest.fn() }; @@ -67,7 +67,7 @@ describe("NetworkMonitor", () => { container.bind(Container.Identifiers.PeerNetworkMonitor).to(NetworkMonitor); container.bind(Container.Identifiers.EventDispatcherService).toConstantValue(emitter); container.bind(Container.Identifiers.PeerCommunicator).toConstantValue(communicator); - container.bind(Container.Identifiers.PeerStorage).toConstantValue(storage); + container.bind(Container.Identifiers.PeerRepository).toConstantValue(repository); container.bind(Container.Identifiers.PluginConfiguration).toConstantValue(pluginConfiguration); container.bind(Container.Identifiers.Application).toConstantValue(app); }); @@ -204,7 +204,7 @@ describe("NetworkMonitor", () => { { ip: "190.177.54.44", port: 4000, version: "3.0.2" }, { ip: "191.177.54.44", port: 4000, version: "3.0.2" }, ]; - storage.getPeers = jest.fn().mockReturnValueOnce(peers); + repository.getPeers = jest.fn().mockReturnValueOnce(peers); await networkMonitor.boot(); @@ -276,7 +276,7 @@ describe("NetworkMonitor", () => { }); it("should discover new peers from existing", async () => { - storage.getPeers.mockReturnValue([]); + repository.getPeers.mockReturnValue([]); const spyDiscoverPeers = jest.spyOn(networkMonitor, "discoverPeers"); await networkMonitor.updateNetworkStatus(); @@ -285,7 +285,7 @@ describe("NetworkMonitor", () => { }); it("should log an error when discovering new peers fails", async () => { - storage.getPeers.mockReturnValue([]); + repository.getPeers.mockReturnValue([]); const spyDiscoverPeers = jest.spyOn(networkMonitor, "discoverPeers"); const errorMessage = "failed discovering peers"; spyDiscoverPeers.mockRejectedValueOnce(new Error(errorMessage)); @@ -300,7 +300,7 @@ describe("NetworkMonitor", () => { describe("when we are below minimum peers", () => { it("should fall back to seed peers when after discovering we are below minimum peers", async () => { config.minimumNetworkReach = 5; - storage.getPeers.mockReturnValue([]); + repository.getPeers.mockReturnValue([]); await networkMonitor.updateNetworkStatus(); @@ -310,7 +310,7 @@ describe("NetworkMonitor", () => { it("should not fall back to seed peers when config.ignoreMinimumNetworkReach", async () => { config.minimumNetworkReach = 5; config.ignoreMinimumNetworkReach = true; - storage.getPeers.mockReturnValue([]); + repository.getPeers.mockReturnValue([]); await networkMonitor.updateNetworkStatus(); @@ -319,7 +319,7 @@ describe("NetworkMonitor", () => { }); it("should schedule the next updateNetworkStatus only once", async () => { - storage.getPeers.mockReturnValue([]); + repository.getPeers.mockReturnValue([]); let sleeping = true; const mockSleep = async () => { @@ -353,11 +353,11 @@ describe("NetworkMonitor", () => { new Peer("191.177.54.44", 4000), ]; beforeEach(() => { - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); }); afterEach(() => { jest.clearAllMocks(); - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); it("should ping every peer when the peers length is <= ", async () => { @@ -421,10 +421,10 @@ describe("NetworkMonitor", () => { new Peer("189.177.54.4", 4000), ]; beforeEach(() => { - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); }); afterEach(() => { - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); it("should get peers from 8 of our peers, and add them to our peers", async () => { @@ -489,22 +489,22 @@ describe("NetworkMonitor", () => { peer.state.height = peersHeights[i]; peers.push(peer); } - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); expect(networkMonitor.getNetworkHeight()).toBe(expectedNetworkHeight); - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); }); describe("getNetworkState", () => { beforeEach(() => { process.env.CORE_ENV = "test"; // for NetworkState analyze - storage.getPeers = jest.fn().mockReturnValue([]); + repository.getPeers = jest.fn().mockReturnValue([]); }); afterEach(() => { delete process.env.CORE_ENV; - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); const block = { @@ -541,10 +541,10 @@ describe("NetworkMonitor", () => { describe("refreshPeersAfterFork", () => { beforeEach(() => { - storage.getPeers = jest.fn().mockReturnValue([]); + repository.getPeers = jest.fn().mockReturnValue([]); }); afterEach(() => { - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); it("should call cleansePeers with {forcePing}", async () => { @@ -560,10 +560,10 @@ describe("NetworkMonitor", () => { describe("checkNetworkHealth", () => { describe("when we have 0 peer", () => { beforeEach(() => { - storage.getPeers = jest.fn().mockReturnValue([]); + repository.getPeers = jest.fn().mockReturnValue([]); }); afterEach(() => { - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); it("should return {forked: false}", async () => { @@ -593,10 +593,10 @@ describe("NetworkMonitor", () => { peers[3].verificationResult = new PeerVerificationResult(3, 4, 2); beforeEach(() => { - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); }); afterEach(() => { - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); it("should return {forked: false}", async () => { const networkStatus = await networkMonitor.checkNetworkHealth(); @@ -629,10 +629,10 @@ describe("NetworkMonitor", () => { beforeEach(() => { stateStore.getLastBlock = jest.fn().mockReturnValueOnce({ data: { height: 43 } }); - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); }); afterEach(() => { - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); it("should return {forked: true, blocksToRollback:}", async () => { @@ -646,7 +646,7 @@ describe("NetworkMonitor", () => { describe("downloadBlocksFromHeight", () => { afterEach(() => { communicator.getPeerBlocks = jest.fn(); - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); }); const downloadChunkSize = 400; @@ -671,7 +671,7 @@ describe("NetworkMonitor", () => { }; it("should return empty array and log an error when we have zero peer", async () => { - storage.getPeers = jest.fn().mockReturnValue([]); + repository.getPeers = jest.fn().mockReturnValue([]); expect(await networkMonitor.downloadBlocksFromHeight(1)).toEqual([]); expect(logger.error).toBeCalledTimes(1); @@ -682,7 +682,7 @@ describe("NetworkMonitor", () => { const peer = new Peer("1.1.1.1", 4000); peer.state = { height: 4, currentSlot: 4, forgingAllowed: true, header: {} }; peer.verificationResult = new PeerVerificationResult(3, 4, 2); - storage.getPeers = jest.fn().mockReturnValue([peer]); + repository.getPeers = jest.fn().mockReturnValue([peer]); expect(await networkMonitor.downloadBlocksFromHeight(1, maxParallelDownloads)).toEqual([]); expect(logger.error).toBeCalledTimes(1); @@ -699,7 +699,7 @@ describe("NetworkMonitor", () => { const peer = new Peer("1.1.1.1", 4000); peer.state = { height: 2, currentSlot: 2, forgingAllowed: true, header: {} }; peer.verificationResult = { forked: false, hisHeight: 2, myHeight: 2, highestCommonHeight: 2 }; - storage.getPeers = jest.fn().mockReturnValue([peer]); + repository.getPeers = jest.fn().mockReturnValue([peer]); expect(await networkMonitor.downloadBlocksFromHeight(1, maxParallelDownloads)).toEqual([mockBlock]); }); @@ -710,7 +710,7 @@ describe("NetworkMonitor", () => { const peer = new Peer("1.1.1.1", 4000); peer.state = { height: 2, currentSlot: 2, forgingAllowed: true, header: {} }; peer.verificationResult = { forked: false, hisHeight: 2, myHeight: 2, highestCommonHeight: 2 }; - storage.getPeers = jest.fn().mockReturnValue([peer]); + repository.getPeers = jest.fn().mockReturnValue([peer]); expect(await networkMonitor.downloadBlocksFromHeight(1, maxParallelDownloads)).toEqual([]); }); @@ -726,7 +726,7 @@ describe("NetworkMonitor", () => { peers.push(peer); } - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); const fromHeight = 1; @@ -749,7 +749,7 @@ describe("NetworkMonitor", () => { peers.push(peer); } - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); const fromHeight = 1; @@ -778,7 +778,7 @@ describe("NetworkMonitor", () => { peers.push(peer); } - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); const chunksToDownloadBeforeThrow = 2; let fromHeight = baseHeight - 1 - chunksToDownloadBeforeThrow * downloadChunkSize; @@ -795,9 +795,10 @@ describe("NetworkMonitor", () => { // (so it will try (numPeers - 1) more times) expect(mockFn.mock.calls.length).toEqual(numPeers + (numPeers - 1)); for (let i = 0; i < numPeers; i++) { - if (i >= chunksToDownloadBeforeThrow && i < (chunksToDownloadBeforeThrow + numPeers)) { - expect(mockFn.mock.calls[i][1].fromBlockHeight).toEqual(fromHeight + chunksToDownloadBeforeThrow * downloadChunkSize); - + if (i >= chunksToDownloadBeforeThrow && i < chunksToDownloadBeforeThrow + numPeers) { + expect(mockFn.mock.calls[i][1].fromBlockHeight).toEqual( + fromHeight + chunksToDownloadBeforeThrow * downloadChunkSize, + ); } else { expect(mockFn.mock.calls[i][1].fromBlockHeight).toEqual(fromHeight + i * downloadChunkSize); } @@ -844,7 +845,7 @@ describe("NetworkMonitor", () => { peers.push(peer); } - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); const chunksToDownload = 2; const fromHeight = baseHeight - 1 - chunksToDownload * downloadChunkSize; @@ -862,7 +863,7 @@ describe("NetworkMonitor", () => { const peer = new Peer("1.1.1.1", 4000); peer.state = { height: 20, currentSlot: 2, forgingAllowed: true, header: {} }; peer.verificationResult = { forked: false, hisHeight: 20, myHeight: 20, highestCommonHeight: 20 }; - storage.getPeers = jest.fn().mockReturnValue([peer]); + repository.getPeers = jest.fn().mockReturnValue([peer]); expect(await networkMonitor.downloadBlocksFromHeight(20, maxParallelDownloads)).toEqual([mockBlock]); }); @@ -884,7 +885,7 @@ describe("NetworkMonitor", () => { peer.verificationResult = { forked: false, hisHeight: 1, myHeight: 1, highestCommonHeight: 1 }; peers.push(peer); } - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); const fromHeight = 1; @@ -892,7 +893,10 @@ describe("NetworkMonitor", () => { for (const expectedBlockLimit of [400, 40, 4, 1, 1, 1]) { // @ts-ignore communicator.getPeerBlocks.mockReset(); - const downloadedBlocks = await networkMonitor.downloadBlocksFromHeight(fromHeight, maxParallelDownloads); + const downloadedBlocks = await networkMonitor.downloadBlocksFromHeight( + fromHeight, + maxParallelDownloads, + ); expect(downloadedBlocks).toEqual([]); // getPeerBlocks fails every time for every peer, so it will try for each peer @@ -911,7 +915,10 @@ describe("NetworkMonitor", () => { .fn() .mockImplementation(expectedBlockLimit === 1 ? mockGetPeerBlocks1Block : mockedGetPeerBlocks); - const downloadedBlocks = await networkMonitor.downloadBlocksFromHeight(fromHeight, maxParallelDownloads); + const downloadedBlocks = await networkMonitor.downloadBlocksFromHeight( + fromHeight, + maxParallelDownloads, + ); const expectedBlocks = expectedBlocksFromHeight(fromHeight).slice(0, numPeers * expectedBlockLimit); @@ -955,10 +962,10 @@ describe("NetworkMonitor", () => { ]; beforeEach(() => { - storage.getPeers = jest.fn().mockReturnValue(peers); + repository.getPeers = jest.fn().mockReturnValue(peers); }); afterEach(() => { - storage.getPeers = jest.fn(); + repository.getPeers = jest.fn(); blockchain.getBlockPing = jest.fn(); }); @@ -973,7 +980,7 @@ describe("NetworkMonitor", () => { expect(logger.info).toBeCalledWith( `Skipping broadcast of block ${block.data.height.toLocaleString()} as blockchain is not ready`, ); - expect(storage.getPeers).toBeCalledTimes(0); + expect(repository.getPeers).toBeCalledTimes(0); expect(communicator.postBlock).toBeCalledTimes(0); // @ts-ignore diff --git a/__tests__/unit/core-p2p/peer-processor.test.ts b/__tests__/unit/core-p2p/peer-processor.test.ts index 98482009d5..163d4d06c7 100644 --- a/__tests__/unit/core-p2p/peer-processor.test.ts +++ b/__tests__/unit/core-p2p/peer-processor.test.ts @@ -20,7 +20,7 @@ describe("PeerProcessor", () => { const eventDispatcher = { listen: jest.fn(), dispatch: jest.fn() }; const peerCommunicator = { ping: jest.fn() }; const peerConnector = { disconnect: jest.fn() }; - const peerStorage = { + const peerRepository = { hasPendingPeer: jest.fn(), getSameSubnetPeers: jest.fn(), hasPeer: jest.fn(), @@ -39,7 +39,7 @@ describe("PeerProcessor", () => { container.bind(Container.Identifiers.EventDispatcherService).toConstantValue(eventDispatcher); container.bind(Container.Identifiers.PeerCommunicator).toConstantValue(peerCommunicator); container.bind(Container.Identifiers.PeerConnector).toConstantValue(peerConnector); - container.bind(Container.Identifiers.PeerStorage).toConstantValue(peerStorage); + container.bind(Container.Identifiers.PeerRepository).toConstantValue(peerRepository); container.bind(Container.Identifiers.Application).toConstantValue(app); container.bind(Container.Identifiers.PeerProcessor).to(PeerProcessor); @@ -60,19 +60,19 @@ describe("PeerProcessor", () => { expect(eventDispatcher.listen).toBeCalledTimes(1); expect(eventDispatcher.listen).toBeCalledWith(Enums.CryptoEvent.MilestoneChanged, expect.anything()); - }) - }) + }); + }); describe("validateAndAcceptPeer", () => { it("should accept a new peer if its ip is validated", async () => { const peer = new Peer("178.165.55.55", 4000); - peerStorage.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); + peerRepository.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); await peerProcessor.validateAndAcceptPeer(peer); - expect(peerStorage.setPendingPeer).toBeCalledTimes(1); + expect(peerRepository.setPendingPeer).toBeCalledTimes(1); expect(peerCommunicator.ping).toBeCalledTimes(1); - expect(peerStorage.setPeer).toBeCalledTimes(1); + expect(peerRepository.setPeer).toBeCalledTimes(1); }); it("should accept a new peer if whitelist is undefined", async () => { @@ -80,13 +80,13 @@ describe("PeerProcessor", () => { configGet.whitelist = undefined; const peer = new Peer("178.165.55.55", 4000); - peerStorage.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); + peerRepository.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); await peerProcessor.validateAndAcceptPeer(peer); - expect(peerStorage.setPendingPeer).toBeCalledTimes(1); + expect(peerRepository.setPendingPeer).toBeCalledTimes(1); expect(peerCommunicator.ping).toBeCalledTimes(1); - expect(peerStorage.setPeer).toBeCalledTimes(1); + expect(peerRepository.setPeer).toBeCalledTimes(1); }); it("should accept a new peer if blacklist is undefined", async () => { @@ -94,38 +94,38 @@ describe("PeerProcessor", () => { configGet.blacklist = undefined; const peer = new Peer("178.165.55.55", 4000); - peerStorage.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); + peerRepository.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); await peerProcessor.validateAndAcceptPeer(peer); - expect(peerStorage.setPendingPeer).toBeCalledTimes(1); + expect(peerRepository.setPendingPeer).toBeCalledTimes(1); expect(peerCommunicator.ping).toBeCalledTimes(1); - expect(peerStorage.setPeer).toBeCalledTimes(1); + expect(peerRepository.setPeer).toBeCalledTimes(1); }); it("should disconnect the peer on any error", async () => { const peer = new Peer("178.165.55.55", 4000); - peerStorage.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); + peerRepository.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); peerCommunicator.ping = jest.fn().mockRejectedValueOnce(new Error("ping threw")); await peerProcessor.validateAndAcceptPeer(peer); - expect(peerStorage.setPendingPeer).toBeCalledTimes(1); + expect(peerRepository.setPendingPeer).toBeCalledTimes(1); expect(peerCommunicator.ping).toBeCalledTimes(1); - expect(peerStorage.setPeer).toBeCalledTimes(0); + expect(peerRepository.setPeer).toBeCalledTimes(0); expect(peerConnector.disconnect).toBeCalledTimes(1); }); it("should not do anything if peer is already added", async () => { const peer = new Peer("178.165.55.55", 4000); - peerStorage.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); - peerStorage.hasPeer = jest.fn().mockReturnValueOnce(true); + peerRepository.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); + peerRepository.hasPeer = jest.fn().mockReturnValueOnce(true); await peerProcessor.validateAndAcceptPeer(peer); - expect(peerStorage.setPendingPeer).toBeCalledTimes(0); + expect(peerRepository.setPendingPeer).toBeCalledTimes(0); expect(peerCommunicator.ping).toBeCalledTimes(0); - expect(peerStorage.setPeer).toBeCalledTimes(0); + expect(peerRepository.setPeer).toBeCalledTimes(0); }); }); @@ -148,7 +148,7 @@ describe("PeerProcessor", () => { }); it("should return false when peer is already in pending peers", () => { - peerStorage.hasPendingPeer = jest.fn().mockReturnValueOnce(true); + peerRepository.hasPendingPeer = jest.fn().mockReturnValueOnce(true); expect(peerProcessor.validatePeerIp(peer)).toBeFalse(); }); @@ -166,12 +166,12 @@ describe("PeerProcessor", () => { it("should return false when there are already too many peers on the peer subnet and not in seed mode", () => { const sameSubnetPeers = [new Peer("178.165.55.50", 4000), new Peer("178.165.55.51", 4000)]; - peerStorage.getSameSubnetPeers = jest.fn().mockReturnValueOnce(sameSubnetPeers); + peerRepository.getSameSubnetPeers = jest.fn().mockReturnValueOnce(sameSubnetPeers); expect(peerProcessor.validatePeerIp(peer)).toBeFalse(); }); it("should return true otherwise", () => { - peerStorage.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); + peerRepository.getSameSubnetPeers = jest.fn().mockReturnValueOnce([]); expect(peerProcessor.validatePeerIp(peer)).toBeTrue(); }); diff --git a/__tests__/unit/core-p2p/peer-storage.test.ts b/__tests__/unit/core-p2p/peer-repository.test.ts similarity index 96% rename from __tests__/unit/core-p2p/peer-storage.test.ts rename to __tests__/unit/core-p2p/peer-repository.test.ts index 6b1ca2227a..3e23ff0f68 100644 --- a/__tests__/unit/core-p2p/peer-storage.test.ts +++ b/__tests__/unit/core-p2p/peer-repository.test.ts @@ -1,10 +1,10 @@ import { Container } from "@arkecosystem/core-kernel"; -import { PeerStorage } from "@arkecosystem/core-p2p/src/peer-storage"; +import { PeerRepository } from "@arkecosystem/core-p2p/src/peer-repository"; import { Peer } from "@arkecosystem/core-p2p/src/peer"; -describe("PeerStorage", () => { - let peerStorage: PeerStorage; +describe("PeerRepository", () => { + let peerStorage: PeerRepository; beforeEach(() => { const container = new Container.Container(); @@ -13,9 +13,9 @@ describe("PeerStorage", () => { container.unbindAll(); container.bind(Container.Identifiers.LogService).toConstantValue(logger); - container.bind(Container.Identifiers.PeerStorage).to(PeerStorage); + container.bind(Container.Identifiers.PeerRepository).to(PeerRepository); - peerStorage = container.get(Container.Identifiers.PeerStorage); + peerStorage = container.get(Container.Identifiers.PeerRepository); }); describe("getPeers", () => { diff --git a/__tests__/unit/core-p2p/service-provider.test.ts b/__tests__/unit/core-p2p/service-provider.test.ts index 513c585a19..314d1b0996 100644 --- a/__tests__/unit/core-p2p/service-provider.test.ts +++ b/__tests__/unit/core-p2p/service-provider.test.ts @@ -72,7 +72,7 @@ describe("ServiceProvider", () => { const Identifiers = Container.Identifiers; for (const identifier of [ Identifiers.PeerFactory, - Identifiers.PeerStorage, + Identifiers.PeerRepository, Identifiers.PeerConnector, Identifiers.PeerCommunicator, Identifiers.PeerProcessor, diff --git a/__tests__/unit/core-p2p/socket-server/controllers/blocks.test.ts b/__tests__/unit/core-p2p/socket-server/controllers/blocks.test.ts index a85691ba3c..72a9fa5ea0 100644 --- a/__tests__/unit/core-p2p/socket-server/controllers/blocks.test.ts +++ b/__tests__/unit/core-p2p/socket-server/controllers/blocks.test.ts @@ -11,7 +11,7 @@ describe("BlocksController", () => { const container = new Container.Container(); const logger = { warning: jest.fn(), debug: jest.fn(), info: jest.fn() }; - const peerStorage = { getPeers: jest.fn() }; + const peerRepository = { getPeers: jest.fn() }; const database = { getCommonBlocks: jest.fn(), getBlocksForDownload: jest.fn() }; const blockchain = { getLastBlock: jest.fn(), @@ -59,7 +59,7 @@ describe("BlocksController", () => { beforeAll(() => { container.unbindAll(); container.bind(Container.Identifiers.LogService).toConstantValue(logger); - container.bind(Container.Identifiers.PeerStorage).toConstantValue(peerStorage); + container.bind(Container.Identifiers.PeerRepository).toConstantValue(peerRepository); container.bind(Container.Identifiers.DatabaseService).toConstantValue(database); container.bind(Container.Identifiers.Application).toConstantValue(app); }); diff --git a/__tests__/unit/core-p2p/socket-server/controllers/peer.test.ts b/__tests__/unit/core-p2p/socket-server/controllers/peer.test.ts index 05765a9965..e193e5d3a4 100644 --- a/__tests__/unit/core-p2p/socket-server/controllers/peer.test.ts +++ b/__tests__/unit/core-p2p/socket-server/controllers/peer.test.ts @@ -13,7 +13,7 @@ describe("PeerController", () => { const container = new Container.Container(); const logger = { warning: jest.fn(), debug: jest.fn(), info: jest.fn() }; - const peerStorage = { getPeers: jest.fn() }; + const peerRepository = { getPeers: jest.fn() }; const database = { getCommonBlocks: jest.fn(), getBlocksForDownload: jest.fn() }; const databaseInteractions = { getCommonBlocks: jest.fn(), @@ -64,7 +64,7 @@ describe("PeerController", () => { beforeAll(() => { container.unbindAll(); container.bind(Container.Identifiers.LogService).toConstantValue(logger); - container.bind(Container.Identifiers.PeerStorage).toConstantValue(peerStorage); + container.bind(Container.Identifiers.PeerRepository).toConstantValue(peerRepository); container.bind(Container.Identifiers.DatabaseService).toConstantValue(database); container.bind(Container.Identifiers.DatabaseInteraction).toConstantValue(databaseInteractions); container.bind(Container.Identifiers.Application).toConstantValue(app); @@ -88,7 +88,7 @@ describe("PeerController", () => { peers[2].latency = 117634; peers[3].latency = 297600; peers[4].latency = 1197634; - peerStorage.getPeers = jest.fn().mockReturnValueOnce(peers); + peerRepository.getPeers = jest.fn().mockReturnValueOnce(peers); const request = { socket: { @@ -113,7 +113,7 @@ describe("PeerController", () => { peers[2].latency = 117634; peers[3].latency = 297600; peers[4].latency = 1197634; - peerStorage.getPeers = jest.fn().mockReturnValueOnce(peers); + peerRepository.getPeers = jest.fn().mockReturnValueOnce(peers); const request = { socket: { diff --git a/__tests__/unit/core-p2p/socket-server/controllers/transactions.test.ts b/__tests__/unit/core-p2p/socket-server/controllers/transactions.test.ts index 0a12a6098c..b79fcd7c28 100644 --- a/__tests__/unit/core-p2p/socket-server/controllers/transactions.test.ts +++ b/__tests__/unit/core-p2p/socket-server/controllers/transactions.test.ts @@ -10,7 +10,7 @@ describe("TransactionsController", () => { const container = new Container.Container(); const logger = { warning: jest.fn(), debug: jest.fn(), info: jest.fn() }; - const peerStorage = { getPeers: jest.fn() }; + const peerRepository = { getPeers: jest.fn() }; const database = { getCommonBlocks: jest.fn(), getBlocksForDownload: jest.fn() }; const blockchain = { getLastBlock: jest.fn(), @@ -19,7 +19,7 @@ describe("TransactionsController", () => { getLastDownloadedBlock: jest.fn(), }; const processor = { - process: jest.fn().mockReturnValue({ accept: []}), + process: jest.fn().mockReturnValue({ accept: [] }), }; const createProcessor = jest.fn(); const appPlugins = [{ package: "@arkecosystem/core-api", options: {} }]; @@ -60,7 +60,7 @@ describe("TransactionsController", () => { beforeAll(() => { container.unbindAll(); container.bind(Container.Identifiers.LogService).toConstantValue(logger); - container.bind(Container.Identifiers.PeerStorage).toConstantValue(peerStorage); + container.bind(Container.Identifiers.PeerRepository).toConstantValue(peerRepository); container.bind(Container.Identifiers.DatabaseService).toConstantValue(database); container.bind(Container.Identifiers.Application).toConstantValue(app); container.bind(Container.Identifiers.TransactionPoolProcessor).toConstantValue(processor); diff --git a/__tests__/unit/core-p2p/transaction-broadcaster.test.ts b/__tests__/unit/core-p2p/transaction-broadcaster.test.ts index 8039f28da3..b8bed1cf07 100644 --- a/__tests__/unit/core-p2p/transaction-broadcaster.test.ts +++ b/__tests__/unit/core-p2p/transaction-broadcaster.test.ts @@ -9,14 +9,14 @@ describe("TransactionBroadcaster", () => { describe("broadcastTransactions", () => { const logger = { warning: jest.fn(), debug: jest.fn() }; const configuration = { getRequired: jest.fn() }; - const storage = { getPeers: jest.fn() }; + const repository = { getPeers: jest.fn() }; const communicator = { postTransactions: jest.fn() }; beforeAll(() => { container.unbindAll(); container.bind(Container.Identifiers.LogService).toConstantValue(logger); container.bind(Container.Identifiers.PluginConfiguration).toConstantValue(configuration); - container.bind(Container.Identifiers.PeerStorage).toConstantValue(storage); + container.bind(Container.Identifiers.PeerRepository).toConstantValue(repository); container.bind(Container.Identifiers.PeerCommunicator).toConstantValue(communicator); }); @@ -24,7 +24,7 @@ describe("TransactionBroadcaster", () => { logger.warning.mockClear(); logger.debug.mockClear(); configuration.getRequired.mockClear(); - storage.getPeers.mockClear(); + repository.getPeers.mockClear(); communicator.postTransactions.mockClear(); }); @@ -35,14 +35,14 @@ describe("TransactionBroadcaster", () => { expect(logger.warning).toBeCalledWith("Broadcasting 0 transactions"); expect(configuration.getRequired).not.toBeCalled(); - expect(storage.getPeers).not.toBeCalled(); + expect(repository.getPeers).not.toBeCalled(); expect(communicator.postTransactions).not.toBeCalled(); }); it("should broadcast transaction to peers", async () => { const peers = [{}, {}, {}]; configuration.getRequired.mockReturnValue(3); - storage.getPeers.mockReturnValue(peers); + repository.getPeers.mockReturnValue(peers); const transactions = [{}]; const serializedTx = Buffer.alloc(0); @@ -52,7 +52,7 @@ describe("TransactionBroadcaster", () => { await broadcaster.broadcastTransactions(transactions as Interfaces.ITransaction[]); expect(configuration.getRequired).toBeCalledWith("maxPeersBroadcast"); - expect(storage.getPeers).toBeCalled(); + expect(repository.getPeers).toBeCalled(); expect(logger.debug).toBeCalledWith("Broadcasting 1 transaction to 3 peers"); expect(spySerialize).toBeCalled(); expect(communicator.postTransactions).toBeCalledWith(peers[0], [serializedTx]); diff --git a/__tests__/unit/core-test-framework/mocks/peer-storage.test.ts b/__tests__/unit/core-test-framework/mocks/peer-repository.test.ts similarity index 60% rename from __tests__/unit/core-test-framework/mocks/peer-storage.test.ts rename to __tests__/unit/core-test-framework/mocks/peer-repository.test.ts index 967786e311..dce6baf83f 100644 --- a/__tests__/unit/core-test-framework/mocks/peer-storage.test.ts +++ b/__tests__/unit/core-test-framework/mocks/peer-repository.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { PeerStorage } from "@packages/core-test-framework/src/mocks"; +import { PeerRepository } from "@packages/core-test-framework/src/mocks"; import { Contracts } from "@packages/core-kernel"; let peer: Partial = { @@ -20,21 +20,21 @@ let peer: Partial = { }; const clear = () => { - PeerStorage.setPeers([]); + PeerRepository.setPeers([]); }; -describe("PeerStorage", () => { +describe("PeerRepository", () => { describe("default values", () => { it("getPeers should return empty array", async () => { - expect(PeerStorage.instance.getPeers()).toEqual([]); + expect(PeerRepository.instance.getPeers()).toEqual([]); }); it("hasPeer should return false", async () => { - expect(PeerStorage.instance.hasPeer("127.0.0.1")).toBeFalse(); + expect(PeerRepository.instance.hasPeer("127.0.0.1")).toBeFalse(); }); it("getPeer should return undefined", async () => { - expect(PeerStorage.instance.getPeer("127.0.0.1")).toBeUndefined(); + expect(PeerRepository.instance.getPeer("127.0.0.1")).toBeUndefined(); }); }); @@ -42,19 +42,19 @@ describe("PeerStorage", () => { beforeEach(() => { clear(); - PeerStorage.setPeers([peer]); + PeerRepository.setPeers([peer]); }); it("getPeers should return mocked peer", async () => { - expect(PeerStorage.instance.getPeers()).toEqual([peer]); + expect(PeerRepository.instance.getPeers()).toEqual([peer]); }); it("getPeers should return true", async () => { - expect(PeerStorage.instance.hasPeer("127.0.0.1")).toBeTrue(); + expect(PeerRepository.instance.hasPeer("127.0.0.1")).toBeTrue(); }); it("getPeers should return first peer", async () => { - expect(PeerStorage.instance.getPeer("127.0.0.1")).toEqual(peer); + expect(PeerRepository.instance.getPeer("127.0.0.1")).toEqual(peer); }); }); }); diff --git a/__tests__/unit/core-test-framework/mocks/query.test.ts b/__tests__/unit/core-test-framework/mocks/query.test.ts index a63f75266b..11bf5f979d 100644 --- a/__tests__/unit/core-test-framework/mocks/query.test.ts +++ b/__tests__/unit/core-test-framework/mocks/query.test.ts @@ -13,7 +13,7 @@ const clear = () => { TransactionPoolQuery.setTransactions([]); }; -describe("PeerStorage", () => { +describe("TransactionPoolQuery", () => { describe("default values", () => { it("getFromHighestPriority should return", async () => { expect(TransactionPoolQuery.instance.getFromHighestPriority()).toEqual({ transactions: [] }); diff --git a/__tests__/unit/core-webhooks/service-provider.test.ts b/__tests__/unit/core-webhooks/service-provider.test.ts index d0329a6ac0..401c8208c1 100644 --- a/__tests__/unit/core-webhooks/service-provider.test.ts +++ b/__tests__/unit/core-webhooks/service-provider.test.ts @@ -34,7 +34,7 @@ beforeEach(() => { app.bind(Container.Identifiers.PeerNetworkMonitor).toConstantValue({}); - app.bind(Container.Identifiers.PeerStorage).toConstantValue({}); + app.bind(Container.Identifiers.PeerRepository).toConstantValue({}); app.bind(Container.Identifiers.DatabaseRoundRepository).toConstantValue({}); diff --git a/packages/core-api/src/controllers/peers.ts b/packages/core-api/src/controllers/peers.ts index 486b1c4644..9e33837ac5 100644 --- a/packages/core-api/src/controllers/peers.ts +++ b/packages/core-api/src/controllers/peers.ts @@ -8,11 +8,11 @@ import { Controller } from "./controller"; @Container.injectable() export class PeersController extends Controller { - @Container.inject(Container.Identifiers.PeerStorage) - private readonly peerStorage!: Contracts.P2P.PeerStorage; + @Container.inject(Container.Identifiers.PeerRepository) + private readonly peerRepository!: Contracts.P2P.PeerRepository; public async index(request: Hapi.Request, h: Hapi.ResponseToolkit) { - const allPeers: Contracts.P2P.Peer[] = [...this.peerStorage.getPeers()]; + const allPeers: Contracts.P2P.Peer[] = [...this.peerRepository.getPeers()]; let results = allPeers; @@ -85,10 +85,10 @@ export class PeersController extends Controller { } public async show(request: Hapi.Request, h: Hapi.ResponseToolkit) { - if (!this.peerStorage.hasPeer(request.params.ip)) { + if (!this.peerRepository.hasPeer(request.params.ip)) { return Boom.notFound("Peer not found"); } - return super.respondWithResource(this.peerStorage.getPeer(request.params.ip), PeerResource); + return super.respondWithResource(this.peerRepository.getPeer(request.params.ip), PeerResource); } } diff --git a/packages/core-blockchain/src/blockchain.ts b/packages/core-blockchain/src/blockchain.ts index e73829597e..4031f59359 100644 --- a/packages/core-blockchain/src/blockchain.ts +++ b/packages/core-blockchain/src/blockchain.ts @@ -38,8 +38,8 @@ export class Blockchain implements Contracts.Blockchain.Blockchain { @Container.inject(Container.Identifiers.PeerNetworkMonitor) private readonly networkMonitor!: Contracts.P2P.NetworkMonitor; - @Container.inject(Container.Identifiers.PeerStorage) - private readonly peerStorage!: Contracts.P2P.PeerStorage; + @Container.inject(Container.Identifiers.PeerRepository) + private readonly peerRepository!: Contracts.P2P.PeerRepository; @Container.inject(Container.Identifiers.EventDispatcherService) private readonly events!: Contracts.Kernel.EventDispatcher; @@ -419,7 +419,7 @@ export class Blockchain implements Contracts.Blockchain.Blockchain { * Determine if the blockchain is synced. */ public isSynced(block?: Interfaces.IBlockData): boolean { - if (!this.peerStorage.hasPeers()) { + if (!this.peerRepository.hasPeers()) { return true; } diff --git a/packages/core-kernel/src/contracts/p2p/index.ts b/packages/core-kernel/src/contracts/p2p/index.ts index f2176b578b..15aa11ebdf 100644 --- a/packages/core-kernel/src/contracts/p2p/index.ts +++ b/packages/core-kernel/src/contracts/p2p/index.ts @@ -3,7 +3,7 @@ export * from "./network-state"; export * from "./peer-connector"; export * from "./peer-communicator"; export * from "./peer-processor"; -export * from "./peer-storage"; +export * from "./peer-repository"; export * from "./peer-verifier"; export * from "./peer"; export * from "./server"; diff --git a/packages/core-kernel/src/contracts/p2p/network-state.ts b/packages/core-kernel/src/contracts/p2p/network-state.ts index 322ef219ac..05845aee37 100644 --- a/packages/core-kernel/src/contracts/p2p/network-state.ts +++ b/packages/core-kernel/src/contracts/p2p/network-state.ts @@ -4,7 +4,7 @@ export interface NetworkState { nodeHeight: number | undefined; lastBlockId: string | undefined; - // static analyze(monitor: NetworkMonitor, storage: PeerStorage): NetworkState; + // static analyze(monitor: NetworkMonitor, repository: PeerRepository): NetworkState; // static parse(data: any): NetworkState; setLastBlock(lastBlock); diff --git a/packages/core-kernel/src/contracts/p2p/peer-storage.ts b/packages/core-kernel/src/contracts/p2p/peer-repository.ts similarity index 93% rename from packages/core-kernel/src/contracts/p2p/peer-storage.ts rename to packages/core-kernel/src/contracts/p2p/peer-repository.ts index 4c9055ed0a..fff0107be8 100644 --- a/packages/core-kernel/src/contracts/p2p/peer-storage.ts +++ b/packages/core-kernel/src/contracts/p2p/peer-repository.ts @@ -1,6 +1,6 @@ import { Peer } from "./peer"; -export interface PeerStorage { +export interface PeerRepository { getPeers(): Peer[]; hasPeers(): boolean; diff --git a/packages/core-kernel/src/ioc/identifiers.ts b/packages/core-kernel/src/ioc/identifiers.ts index ba7273a676..393ba85203 100644 --- a/packages/core-kernel/src/ioc/identifiers.ts +++ b/packages/core-kernel/src/ioc/identifiers.ts @@ -92,7 +92,7 @@ export const Identifiers = { PeerConnector: Symbol.for("Peer"), PeerNetworkMonitor: Symbol.for("Peer"), PeerProcessor: Symbol.for("Peer"), - PeerStorage: Symbol.for("Peer"), + PeerRepository: Symbol.for("Peer"), PeerTransactionBroadcaster: Symbol.for("Peer"), PeerEventListener: Symbol.for("Peer"), // Transaction Pool diff --git a/packages/core-p2p/src/contracts.ts b/packages/core-p2p/src/contracts.ts index af70fb8e76..ca9bfddd6a 100644 --- a/packages/core-p2p/src/contracts.ts +++ b/packages/core-p2p/src/contracts.ts @@ -4,7 +4,7 @@ export type PeerFactory = (ip: string) => Contracts.P2P.Peer; export interface PeerService { connector: Contracts.P2P.PeerConnector; - storage: Contracts.P2P.PeerStorage; + repository: Contracts.P2P.PeerRepository; communicator: Contracts.P2P.PeerCommunicator; processor: Contracts.P2P.PeerProcessor; networkMonitor: Contracts.P2P.NetworkMonitor; diff --git a/packages/core-p2p/src/index.ts b/packages/core-p2p/src/index.ts index bec25584b4..0bd6b47187 100644 --- a/packages/core-p2p/src/index.ts +++ b/packages/core-p2p/src/index.ts @@ -4,7 +4,7 @@ export * from "./enums"; export * from "./network-state"; export * from "./network-monitor"; export * from "./peer"; -export * from "./peer-storage"; +export * from "./peer-repository"; export * from "./service-provider"; export * from "./socket-server/codecs"; export * from "./utils"; diff --git a/packages/core-p2p/src/listeners.ts b/packages/core-p2p/src/listeners.ts index 13c4062c58..7405aa7f4e 100644 --- a/packages/core-p2p/src/listeners.ts +++ b/packages/core-p2p/src/listeners.ts @@ -19,11 +19,11 @@ export class DisconnectInvalidPeers implements Contracts.Kernel.EventListener { /** * @private - * @type {Contracts.P2P.PeerStorage} + * @type {Contracts.P2P.PeerRepository} * @memberof DisconnectInvalidPeers */ - @Container.inject(Container.Identifiers.PeerStorage) - private readonly storage!: Contracts.P2P.PeerStorage; + @Container.inject(Container.Identifiers.PeerRepository) + private readonly repository!: Contracts.P2P.PeerRepository; /** * @private @@ -38,7 +38,7 @@ export class DisconnectInvalidPeers implements Contracts.Kernel.EventListener { * @memberof DisconnectInvalidPeers */ public async handle(): Promise { - const peers: Contracts.P2P.Peer[] = this.storage.getPeers(); + const peers: Contracts.P2P.Peer[] = this.repository.getPeers(); for (const peer of peers) { if (!isValidVersion(this.app, peer)) { @@ -64,11 +64,11 @@ export class DisconnectPeer implements Contracts.Kernel.EventListener { /** * @private - * @type {Contracts.P2P.PeerStorage} + * @type {Contracts.P2P.PeerRepository} * @memberof DisconnectPeer */ - @Container.inject(Container.Identifiers.PeerStorage) - private readonly storage!: Contracts.P2P.PeerStorage; + @Container.inject(Container.Identifiers.PeerRepository) + private readonly repository!: Contracts.P2P.PeerRepository; /** * @param {*} {peer} @@ -78,6 +78,6 @@ export class DisconnectPeer implements Contracts.Kernel.EventListener { public async handle({ data }): Promise { this.connector.disconnect(data.peer); - this.storage.forgetPeer(data.peer); + this.repository.forgetPeer(data.peer); } } diff --git a/packages/core-p2p/src/network-monitor.ts b/packages/core-p2p/src/network-monitor.ts index b91a9cda09..df131e714e 100644 --- a/packages/core-p2p/src/network-monitor.ts +++ b/packages/core-p2p/src/network-monitor.ts @@ -23,8 +23,8 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { @Container.inject(Container.Identifiers.PeerCommunicator) private readonly communicator!: PeerCommunicator; - @Container.inject(Container.Identifiers.PeerStorage) - private readonly storage!: Contracts.P2P.PeerStorage; + @Container.inject(Container.Identifiers.PeerRepository) + private readonly repository!: Contracts.P2P.PeerRepository; @Container.inject(Container.Identifiers.EventDispatcherService) private readonly events!: Contracts.Kernel.EventDispatcher; @@ -69,7 +69,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { for (const [version, peers] of Object.entries( // @ts-ignore - Utils.groupBy(this.storage.getPeers(), (peer) => peer.version), + Utils.groupBy(this.repository.getPeers(), (peer) => peer.version), )) { this.logger.info(`Discovered ${Utils.pluralize("peer", peers.length, true)} with v${version}.`); } @@ -123,7 +123,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { forcePing = false, peerCount, }: { fast?: boolean; forcePing?: boolean; peerCount?: number } = {}): Promise { - let peers = this.storage.getPeers(); + let peers = this.repository.getPeers(); let max = peers.length; let unresponsivePeers = 0; @@ -183,11 +183,11 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { public async discoverPeers(pingAll?: boolean): Promise { const maxPeersPerPeer = 50; - const ownPeers: Contracts.P2P.Peer[] = this.storage.getPeers(); + const ownPeers: Contracts.P2P.Peer[] = this.repository.getPeers(); const theirPeers: Contracts.P2P.Peer[] = Object.values( ( await Promise.all( - Utils.shuffle(this.storage.getPeers()) + Utils.shuffle(this.repository.getPeers()) .slice(0, 8) .map(async (peer: Contracts.P2P.Peer) => { try { @@ -242,7 +242,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { } public getNetworkHeight(): number { - const medians = this.storage + const medians = this.repository .getPeers() .filter((peer) => peer.state.height) .map((peer) => peer.state.height) @@ -259,11 +259,11 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { public async getNetworkState(): Promise { await this.cleansePeers({ fast: true, forcePing: true }); - return await NetworkState.analyze(this, this.storage); + return await NetworkState.analyze(this, this.repository); } public async refreshPeersAfterFork(): Promise { - this.logger.info(`Refreshing ${this.storage.getPeers().length} peers after fork.`); + this.logger.info(`Refreshing ${this.repository.getPeers().length} peers after fork.`); await this.cleansePeers({ forcePing: true }); } @@ -276,7 +276,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { .get(Container.Identifiers.StateStore) .getLastBlock(); - const allPeers: Contracts.P2P.Peer[] = this.storage.getPeers(); + const allPeers: Contracts.P2P.Peer[] = this.repository.getPeers(); if (!allPeers.length) { this.logger.info("No peers available."); @@ -326,7 +326,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { fromBlockHeight: number, maxParallelDownloads = 10, ): Promise { - const peersAll: Contracts.P2P.Peer[] = this.storage.getPeers(); + const peersAll: Contracts.P2P.Peer[] = this.repository.getPeers(); if (peersAll.length === 0) { this.logger.error(`Could not download blocks: we have 0 peers`); @@ -391,7 +391,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { if (peersToTry.length === 1) { // special case where we don't have "backup peers" (that have not been first-attempt for any job) // so add peers that have been first-attempt as backup peers - peersToTry.push(...peersNotForked.filter(p => p.ip !== peersNotForked[i].ip)); + peersToTry.push(...peersNotForked.filter((p) => p.ip !== peersNotForked[i].ip)); } for (peer of peersToTry) { @@ -488,7 +488,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { } let blockPing = blockchain.getBlockPing(); - let peers: Contracts.P2P.Peer[] = this.storage.getPeers(); + let peers: Contracts.P2P.Peer[] = this.repository.getPeers(); if (blockPing && blockPing.block.id === block.data.id) { // wait a bit before broadcasting if a bit early @@ -525,7 +525,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { } private async pingPeerPorts(pingAll?: boolean): Promise { - let peers = this.storage.getPeers(); + let peers = this.repository.getPeers(); if (!pingAll) { peers = Utils.shuffle(peers).slice(0, Math.floor(peers.length / 2)); } @@ -578,7 +578,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { return true; } - return Object.keys(this.storage.getPeers()).length >= this.config.minimumNetworkReach; + return Object.keys(this.repository.getPeers()).length >= this.config.minimumNetworkReach; } private async populateSeedPeers(): Promise { @@ -609,7 +609,7 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor { return Promise.all( // @ts-ignore Object.values(peers).map((peer: Contracts.P2P.Peer) => { - this.storage.forgetPeer(peer); + this.repository.forgetPeer(peer); return this.app .get(Container.Identifiers.TriggerService) diff --git a/packages/core-p2p/src/network-state.ts b/packages/core-p2p/src/network-state.ts index 6f930d2e0b..fc61e94517 100644 --- a/packages/core-p2p/src/network-state.ts +++ b/packages/core-p2p/src/network-state.ts @@ -70,7 +70,7 @@ export class NetworkState implements Contracts.P2P.NetworkState { public static async analyze( monitor: Contracts.P2P.NetworkMonitor, - storage: Contracts.P2P.PeerStorage, + repository: Contracts.P2P.PeerRepository, ): Promise { // @ts-ignore - app exists but isn't on the interface for now const lastBlock: Interfaces.IBlock = monitor.app @@ -83,7 +83,7 @@ export class NetworkState implements Contracts.P2P.NetworkState { lastBlock.data.height, ); - const peers: Contracts.P2P.Peer[] = storage.getPeers(); + const peers: Contracts.P2P.Peer[] = repository.getPeers(); // @ts-ignore - app exists but isn't on the interface for now const configuration = monitor.app.getTagged( Container.Identifiers.PluginConfiguration, diff --git a/packages/core-p2p/src/peer-processor.ts b/packages/core-p2p/src/peer-processor.ts index 3dfbcc41a0..ff452be3ab 100644 --- a/packages/core-p2p/src/peer-processor.ts +++ b/packages/core-p2p/src/peer-processor.ts @@ -20,8 +20,8 @@ export class PeerProcessor implements Contracts.P2P.PeerProcessor { @Container.inject(Container.Identifiers.PeerConnector) private readonly connector!: Contracts.P2P.PeerConnector; - @Container.inject(Container.Identifiers.PeerStorage) - private readonly storage!: Contracts.P2P.PeerStorage; + @Container.inject(Container.Identifiers.PeerRepository) + private readonly repository!: Contracts.P2P.PeerRepository; @Container.inject(Container.Identifiers.EventDispatcherService) private readonly events!: Contracts.Kernel.EventDispatcher; @@ -57,7 +57,7 @@ export class PeerProcessor implements Contracts.P2P.PeerProcessor { return false; } - if (!Utils.isValidPeer(peer) || this.storage.hasPendingPeer(peer.ip)) { + if (!Utils.isValidPeer(peer) || this.repository.hasPendingPeer(peer.ip)) { return false; } @@ -73,7 +73,7 @@ export class PeerProcessor implements Contracts.P2P.PeerProcessor { const maxSameSubnetPeers = this.configuration.getRequired("maxSameSubnetPeers"); - if (this.storage.getSameSubnetPeers(peer.ip).length >= maxSameSubnetPeers && !options.seed) { + if (this.repository.getSameSubnetPeers(peer.ip).length >= maxSameSubnetPeers && !options.seed) { /* istanbul ignore else */ if (process.env.CORE_P2P_PEER_VERIFIER_DEBUG_EXTRA) { this.logger.warning( @@ -88,20 +88,20 @@ export class PeerProcessor implements Contracts.P2P.PeerProcessor { } private async acceptNewPeer(peer, options: Contracts.P2P.AcceptNewPeerOptions): Promise { - if (this.storage.hasPeer(peer.ip)) { + if (this.repository.hasPeer(peer.ip)) { return; } const newPeer: Contracts.P2P.Peer = this.app.get(Container.Identifiers.PeerFactory)(peer.ip); try { - this.storage.setPendingPeer(peer); + this.repository.setPendingPeer(peer); const verifyTimeout = this.configuration.getRequired("verifyTimeout"); await this.communicator.ping(newPeer, verifyTimeout); - this.storage.setPeer(newPeer); + this.repository.setPeer(newPeer); /* istanbul ignore next */ if (!options.lessVerbose || process.env.CORE_P2P_PEER_VERIFIER_DEBUG_EXTRA) { @@ -112,7 +112,7 @@ export class PeerProcessor implements Contracts.P2P.PeerProcessor { } catch (error) { this.connector.disconnect(newPeer); } finally { - this.storage.forgetPendingPeer(peer); + this.repository.forgetPendingPeer(peer); } return; diff --git a/packages/core-p2p/src/peer-storage.ts b/packages/core-p2p/src/peer-repository.ts similarity index 96% rename from packages/core-p2p/src/peer-storage.ts rename to packages/core-p2p/src/peer-repository.ts index e8e1849d2f..35fdcbf241 100644 --- a/packages/core-p2p/src/peer-storage.ts +++ b/packages/core-p2p/src/peer-repository.ts @@ -3,7 +3,7 @@ import { cidr } from "ip"; // todo: review the implementation @Container.injectable() -export class PeerStorage implements Contracts.P2P.PeerStorage { +export class PeerRepository implements Contracts.P2P.PeerRepository { private readonly peers: Map = new Map(); private readonly peersPending: Map = new Map(); diff --git a/packages/core-p2p/src/service-provider.ts b/packages/core-p2p/src/service-provider.ts index 64b37780a9..9d4396e6e3 100644 --- a/packages/core-p2p/src/service-provider.ts +++ b/packages/core-p2p/src/service-provider.ts @@ -8,7 +8,7 @@ import { Peer } from "./peer"; import { PeerCommunicator } from "./peer-communicator"; import { PeerConnector } from "./peer-connector"; import { PeerProcessor } from "./peer-processor"; -import { PeerStorage } from "./peer-storage"; +import { PeerRepository } from "./peer-repository"; import { Server } from "./socket-server/server"; import { TransactionBroadcaster } from "./transaction-broadcaster"; @@ -99,7 +99,7 @@ export class ServiceProvider extends Providers.ServiceProvider { } private registerServices(): void { - this.app.bind(Container.Identifiers.PeerStorage).to(PeerStorage).inSingletonScope(); + this.app.bind(Container.Identifiers.PeerRepository).to(PeerRepository).inSingletonScope(); this.app.bind(Container.Identifiers.PeerConnector).to(PeerConnector).inSingletonScope(); diff --git a/packages/core-p2p/src/socket-server/controllers/peer.ts b/packages/core-p2p/src/socket-server/controllers/peer.ts index 34b269383b..2177b3aac5 100644 --- a/packages/core-p2p/src/socket-server/controllers/peer.ts +++ b/packages/core-p2p/src/socket-server/controllers/peer.ts @@ -10,8 +10,8 @@ import { getPeerIp } from "../../utils/get-peer-ip"; import { constants } from "../../constants"; export class PeerController extends Controller { - @Container.inject(Container.Identifiers.PeerStorage) - private readonly peerStorage!: Contracts.P2P.PeerStorage; + @Container.inject(Container.Identifiers.PeerRepository) + private readonly peerRepository!: Contracts.P2P.PeerRepository; @Container.inject(Container.Identifiers.DatabaseInteraction) private readonly databaseInteraction!: DatabaseInteraction; @@ -19,7 +19,7 @@ export class PeerController extends Controller { public getPeers(request: Hapi.Request, h: Hapi.ResponseToolkit): Contracts.P2P.PeerBroadcast[] { const peerIp = getPeerIp(request.socket); - return this.peerStorage + return this.peerRepository .getPeers() .filter((peer) => peer.ip !== peerIp) .filter((peer) => peer.port !== -1) diff --git a/packages/core-p2p/src/transaction-broadcaster.ts b/packages/core-p2p/src/transaction-broadcaster.ts index b964f35094..4ab61e9084 100644 --- a/packages/core-p2p/src/transaction-broadcaster.ts +++ b/packages/core-p2p/src/transaction-broadcaster.ts @@ -12,8 +12,8 @@ export class TransactionBroadcaster implements Contracts.P2P.TransactionBroadcas @Container.tagged("plugin", "@arkecosystem/core-p2p") private readonly configuration!: Providers.PluginConfiguration; - @Container.inject(Container.Identifiers.PeerStorage) - private readonly storage!: Contracts.P2P.PeerStorage; + @Container.inject(Container.Identifiers.PeerRepository) + private readonly repository!: Contracts.P2P.PeerRepository; @Container.inject(Container.Identifiers.PeerCommunicator) private readonly communicator!: PeerCommunicator; @@ -25,15 +25,13 @@ export class TransactionBroadcaster implements Contracts.P2P.TransactionBroadcas } const maxPeersBroadcast: number = this.configuration.getRequired("maxPeersBroadcast"); - const peers: Contracts.P2P.Peer[] = Utils.take(Utils.shuffle(this.storage.getPeers()), maxPeersBroadcast); + const peers: Contracts.P2P.Peer[] = Utils.take(Utils.shuffle(this.repository.getPeers()), maxPeersBroadcast); const transactionsStr = Utils.pluralize("transaction", transactions.length, true); const peersStr = Utils.pluralize("peer", peers.length, true); this.logger.debug(`Broadcasting ${transactionsStr} to ${peersStr}`); - const transactionsBroadcast: Buffer[] = transactions.map( - (t) => Transactions.Serializer.serialize(t) - ); + const transactionsBroadcast: Buffer[] = transactions.map((t) => Transactions.Serializer.serialize(t)); const promises = peers.map((p) => this.communicator.postTransactions(p, transactionsBroadcast)); await Promise.all(promises); diff --git a/packages/core-test-framework/src/mocks/index.ts b/packages/core-test-framework/src/mocks/index.ts index 80922d79b2..610e023488 100644 --- a/packages/core-test-framework/src/mocks/index.ts +++ b/packages/core-test-framework/src/mocks/index.ts @@ -1,7 +1,7 @@ export * as BlockRepository from "./block-repository"; export * as Blockchain from "./blockchain"; export * as NetworkMonitor from "./network-monitor"; -export * as PeerStorage from "./peer-storage"; +export * as PeerRepository from "./peer-repository"; export * as TransactionPoolQuery from "./query"; export * as RoundRepository from "./round-repository"; export * as ServiceProviderRepository from "./service-provider-repository"; diff --git a/packages/core-test-framework/src/mocks/peer-storage.ts b/packages/core-test-framework/src/mocks/peer-repository.ts similarity index 74% rename from packages/core-test-framework/src/mocks/peer-storage.ts rename to packages/core-test-framework/src/mocks/peer-repository.ts index f6f5fdf118..2a5c161990 100644 --- a/packages/core-test-framework/src/mocks/peer-storage.ts +++ b/packages/core-test-framework/src/mocks/peer-repository.ts @@ -1,5 +1,5 @@ import { Contracts } from "@arkecosystem/core-kernel"; -import { PeerStorage } from "@arkecosystem/core-p2p"; +import { PeerRepository } from "@arkecosystem/core-p2p"; let mockPeers: Partial[] = []; @@ -7,7 +7,7 @@ export const setPeers = (peers: Partial[]) => { mockPeers = peers; }; -class PeerStorageMock implements Partial { +class PeerRepositoryMock implements Partial { public getPeers(): Contracts.P2P.Peer[] { return mockPeers as Contracts.P2P.Peer[]; } @@ -21,4 +21,4 @@ class PeerStorageMock implements Partial { } } -export const instance = new PeerStorageMock(); +export const instance = new PeerRepositoryMock();