From 625753a4d4ad7f27d229423d02b1ed92d0e16f0a Mon Sep 17 00:00:00 2001
From: Chinmay Kousik <chinmaykousik1@gmail.com>
Date: Wed, 25 Jan 2023 14:29:03 +0530
Subject: [PATCH] fix tests expecting hop to be enabled

---
 src/circuit/relay.ts                       |  6 +++---
 src/circuit/transport.ts                   | 10 +++++++---
 test/configuration/protocol-prefix.node.ts |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/circuit/relay.ts b/src/circuit/relay.ts
index a2c5cc1bf8..33f6ab0246 100644
--- a/src/circuit/relay.ts
+++ b/src/circuit/relay.ts
@@ -3,7 +3,7 @@ import { codes } from '../errors.js'
 import {
   setDelayedInterval,
   clearDelayedInterval
-// @ts-expect-error set-delayed-interval does not export types
+  // @ts-expect-error set-delayed-interval does not export types
 } from 'set-delayed-interval'
 import { namespaceToCid } from './utils.js'
 import {
@@ -62,9 +62,9 @@ export class Relay implements Startable {
    * Stop Relay service
    */
   async stop () {
-    if (this.timeout != null) {
+    try {
       clearDelayedInterval(this.timeout)
-    }
+    } catch (err) { }
 
     this.started = false
   }
diff --git a/src/circuit/transport.ts b/src/circuit/transport.ts
index 46c8589bf5..f4480005cf 100644
--- a/src/circuit/transport.ts
+++ b/src/circuit/transport.ts
@@ -109,13 +109,17 @@ export class Circuit implements Transport, Startable {
         log.error(err)
       })
 
-    this.reservationStore.start()
+    if (this._init.hop.enabled === true) {
+      this.reservationStore.start()
+    }
   }
 
   async stop () {
-    this.reservationStore.stop()
+    if (this._init.hop.enabled === true) {
+      this.reservationStore.stop()
+      await this.components.registrar.unhandle(RELAY_V2_HOP_CODEC)
+    }
     await this.components.registrar.unhandle(RELAY_V1_CODEC)
-    await this.components.registrar.unhandle(RELAY_V2_HOP_CODEC)
     await this.components.registrar.unhandle(RELAY_V2_STOP_CODEC)
   }
 
diff --git a/test/configuration/protocol-prefix.node.ts b/test/configuration/protocol-prefix.node.ts
index a8e72df081..6418dd093f 100644
--- a/test/configuration/protocol-prefix.node.ts
+++ b/test/configuration/protocol-prefix.node.ts
@@ -33,7 +33,7 @@ describe('Protocol prefix is configurable', () => {
     const protocols = await libp2p.peerStore.protoBook.get(libp2p.peerId)
     expect(protocols).to.include.members([
       `/${testProtocol}/fetch/0.0.1`,
-      '/libp2p/circuit/relay/0.2.0/hop',
+      '/libp2p/circuit/relay/0.2.0/stop',
       `/${testProtocol}/id/1.0.0`,
       `/${testProtocol}/id/push/1.0.0`,
       `/${testProtocol}/ping/1.0.0`
@@ -46,7 +46,7 @@ describe('Protocol prefix is configurable', () => {
 
     const protocols = await libp2p.peerStore.protoBook.get(libp2p.peerId)
     expect(protocols).to.include.members([
-      '/libp2p/circuit/relay/0.2.0/hop',
+      '/libp2p/circuit/relay/0.2.0/stop',
       '/ipfs/id/1.0.0',
       '/ipfs/id/push/1.0.0',
       '/ipfs/ping/1.0.0',