From de786d1fd7120d2074796fdc02c9a1bb5d79315a Mon Sep 17 00:00:00 2001
From: keeramis <keerthy.amisagadda@gmail.com>
Date: Wed, 2 Aug 2023 19:46:19 +0530
Subject: [PATCH] Clean up

---
 src/usb-device-webusb.js |  26 ---------
 test/dfu-device.js       |  15 +++++-
 test/support/fake-usb.js |   9 ----
 test/support/usb-data.js | 114 ---------------------------------------
 4 files changed, 13 insertions(+), 151 deletions(-)
 delete mode 100644 test/support/usb-data.js

diff --git a/src/usb-device-webusb.js b/src/usb-device-webusb.js
index edf1a25d..92e8e143 100644
--- a/src/usb-device-webusb.js
+++ b/src/usb-device-webusb.js
@@ -119,32 +119,6 @@ class UsbDevice {
 		}
 	}
 
-	getInterfaceInfo() {
-
-	}
-
-	getDescriptorString(intrface) {
-		return new Promise((resolve) => {
-			try {
-				this._dev.getStringDescriptor(intrface, (err, intrfaceName) => {
-					if (err) {
-						try {
-							this._dev.close();
-						} catch (err) {
-							console.log(`Unable to close device: ${err.message}`);
-							// Ignore error
-						}
-						throw new Error('Unable to get serial number descriptor');
-					}
-					this._dev.particle.isOpen = true;
-					resolve(intrfaceName);
-				});
-			} catch (err) {
-				throw new Error('Failed to claim interface');
-			}
-		});
-	}
-
 	get vendorId() {
 		return this._dev.vendorId;
 	}
diff --git a/test/dfu-device.js b/test/dfu-device.js
index 4fbf69a4..a0e532a5 100644
--- a/test/dfu-device.js
+++ b/test/dfu-device.js
@@ -1,7 +1,6 @@
 const { fakeUsb, expect } = require('./support');
 const proxyquire = require('proxyquire');
 const sinon = require('sinon');
-const { InternalFlashParsedP2 } = require('./support/usb-data');
 const { DfuDeviceState, DfuseCommand } = require('../src/dfu');
 
 const { getDevices } = proxyquire('../src/particle-usb', {
@@ -142,7 +141,19 @@ describe('dfu device', () => {	// actually tests src/dfu.js which is the dfu dri
 				const p2Dev = devs[0];
 				await p2Dev.open();
 				expect(p2Dev.isOpen).to.be.true;
-				p2Dev._dfu._memoryInfo = InternalFlashParsedP2;
+				p2Dev._dfu._memoryInfo = {
+					'name': 'Internal Flash',
+					'segments': [
+						{
+							'start': 134217728,
+							'sectorSize': 4096,
+							'end': 142606336,
+							'readable': true,
+							'erasable': true,
+							'writable': true
+						}
+					]
+				};
 				const startAddr = 134610944;
 				const length = 1009100;
 				const dfuseCommandStub = sinon.stub(p2Dev._dfu, '_dfuseCommand');
diff --git a/test/support/fake-usb.js b/test/support/fake-usb.js
index 15ac6dc6..bdd44cf5 100644
--- a/test/support/fake-usb.js
+++ b/test/support/fake-usb.js
@@ -321,10 +321,6 @@ class DfuClass {
 		};
 	}
 
-	_getInterfaces() {
-		return;
-	}
-
 	hostToDeviceRequest(setup, data) {
 		if (setup.bmRequestType !== dfu.DfuBmRequestType.HOST_TO_DEVICE) {
 			throw new UsbError('Unknown bmRequestType');
@@ -388,11 +384,6 @@ class DfuClass {
 
 	setAltSetting(/* iface, setting */) {
 		// Noop for now
-
-		// check if alt interface is <=2
-
-		// set the interfaces in the device descriptor to something
-
 	}
 
 	async _pollUntil(statePredicate) {
diff --git a/test/support/usb-data.js b/test/support/usb-data.js
deleted file mode 100644
index 094fb2e5..00000000
--- a/test/support/usb-data.js
+++ /dev/null
@@ -1,114 +0,0 @@
-const iInterface7 = {
-	_dev: {
-		interfaces: [
-			{
-				altSetting: 1,
-				interfaceNumber: 0,
-				descriptor: {
-					extra: [0x09, 0x21, 0x0b, 0xff, 0, 0, 0x10, 0x1A, 0x01],
-					iInterface: 7
-				}
-			}
-		],
-
-		// Add the 'interface' function
-		interface: function (interfaceNumber) {
-			const interfaceObj = this.interfaces.find(
-				(iface) => iface.interfaceNumber === interfaceNumber
-			);
-
-			if (interfaceObj) {
-				return interfaceObj.altSetting;
-			} else {
-				return undefined; // Or any default value for interface not found
-			}
-		}
-	}
-};
-
-const iInterface6 = {
-	_dev: {
-		interfaces: [
-			{
-				altSetting: 1,
-				interfaceNumber: 0,
-				descriptor: {
-					extra: [],
-					iInterface: 7
-				}
-			}
-		],
-
-		// Add the 'interface' function
-		interface: function (interfaceNumber) {
-			const interfaceObj = this.interfaces.find(
-				(iface) => iface.interfaceNumber === interfaceNumber
-			);
-
-			if (interfaceObj) {
-				return interfaceObj.altSetting;
-			} else {
-				return undefined; // Or any default value for interface not found
-			}
-		}
-	}
-};
-
-const InternalFlashParsedElectron = {
-	'name': 'Internal Flash',
-	'segments': [
-		{
-			'start': 134217728,
-			'sectorSize': 16384,
-			'end': 134266880,
-			'readable': true,
-			'erasable': false,
-			'writable': false
-		},
-		{
-			'start': 134266880,
-			'sectorSize': 16384,
-			'end': 134283264,
-			'readable': true,
-			'erasable': true,
-			'writable': true
-		},
-		{
-			'start': 134283264,
-			'sectorSize': 65536,
-			'end': 134348800,
-			'readable': true,
-			'erasable': true,
-			'writable': true
-		},
-		{
-			'start': 134348800,
-			'sectorSize': 131072,
-			'end': 135266304,
-			'readable': true,
-			'erasable': true,
-			'writable': true
-		}
-	]
-};
-
-const InternalFlashParsedP2 = {
-	'name': 'Internal Flash',
-	'segments': [
-		{
-			'start': 134217728,
-			'sectorSize': 4096,
-			'end': 142606336,
-			'readable': true,
-			'erasable': true,
-			'writable': true
-		}
-	]
-};
-
-module.exports = {
-	iInterface7,
-	iInterface6,
-	InternalFlashParsedElectron,
-	InternalFlashParsedP2
-};