mirror of
https://github.com/Permissionless-Software-Foundation/ipfs-bch-wallet-service.git
synced 2026-09-21 16:52:03 -07:00
Fixed merge conflicts
This commit is contained in:
@@ -3,10 +3,10 @@
|
||||
*/
|
||||
|
||||
// Public npm libraries
|
||||
const assert = require('chai').assert
|
||||
const sinon = require('sinon')
|
||||
import sinon from 'sinon'
|
||||
|
||||
const Controllers = require('../../../src/controllers')
|
||||
import Controllers from '../../../src/controllers/index.js'
|
||||
const assert = require('chai').assert
|
||||
|
||||
describe('#Controllers', () => {
|
||||
let uut
|
||||
@@ -33,6 +33,9 @@ describe('#Controllers', () => {
|
||||
attachRPCRouter: () => {}
|
||||
}
|
||||
|
||||
// Mock the timer controllers
|
||||
sandbox.stub(uut.timerControllers, 'startTimers').returns()
|
||||
|
||||
const app = {
|
||||
use: () => {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user