Skip to content

Commit

Permalink
chore(core-p2p): schedule network status updates when networkStart fl…
Browse files Browse the repository at this point in the history
…ag is set (#4363)
  • Loading branch information
sebastijankuzner authored Apr 7, 2021
1 parent 2abae69 commit c08ebd4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
16 changes: 12 additions & 4 deletions __tests__/unit/core-p2p/network-monitor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ describe("NetworkMonitor", () => {
jest.resetAllMocks();
});

afterEach(() => {
jest.restoreAllMocks();
});

describe.each([[true], [false]])("boot", (dnsAndNtpFail) => {
beforeEach(() => {
if (dnsAndNtpFail) {
Expand Down Expand Up @@ -228,7 +232,7 @@ describe("NetworkMonitor", () => {
});

it("should not do anything", async () => {
const spyDiscoverPeers = jest.spyOn(networkMonitor, "discoverPeers");
const spyDiscoverPeers = jest.spyOn(networkMonitor, "discoverPeers")

await networkMonitor.updateNetworkStatus();

Expand All @@ -239,20 +243,24 @@ describe("NetworkMonitor", () => {

describe("when in 'network start' mode", () => {
beforeEach(() => {
delete process.env.NODE_ENV;
config.networkStart = true;
});
afterEach(() => {
config.networkStart = undefined;
});

it("should set coldStart to true and not discover peers", async () => {
const spyDiscoverPeers = jest.spyOn(networkMonitor, "discoverPeers");
it("should set coldStart to true and discover peers", async () => {
const spyDiscoverPeers = jest.spyOn(networkMonitor, "discoverPeers").mockResolvedValue(false);
// @ts-ignore
const spyHasMinimumPeers = jest.spyOn(networkMonitor, "hasMinimumPeers").mockReturnValue(true);
expect(networkMonitor.isColdStart()).toBeFalse();

await networkMonitor.updateNetworkStatus();

expect(networkMonitor.isColdStart()).toBeTrue();
expect(spyDiscoverPeers).toBeCalledTimes(0);
expect(spyDiscoverPeers).toBeCalledTimes(1);
expect(spyHasMinimumPeers).toBeCalledTimes(1);
});
});

Expand Down
1 change: 0 additions & 1 deletion packages/core-p2p/src/network-monitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ export class NetworkMonitor implements Contracts.P2P.NetworkMonitor {
if (this.config.networkStart) {
this.coldStart = true;
this.logger.warning("Entering cold start because the relay is in genesis-start mode.");
return;
}

if (this.config.disableDiscovery) {
Expand Down

0 comments on commit c08ebd4

Please sign in to comment.