From 32cb19125f8fd19b96ea3369300b6e23bfcc1120 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 9 Jul 2021 14:00:28 +1000
Subject: [PATCH] remove signalprotocoladress unused

---
 libtextsecure/libsignal-protocol.d.ts         | 12 -------
 libtextsecure/libsignal-protocol.js           | 36 -------------------
 .../unit/crypto/MessageEncrypter_test.ts      |  4 ---
 .../session/unit/sending/MessageQueue_test.ts |  4 ---
 4 files changed, 56 deletions(-)

diff --git a/libtextsecure/libsignal-protocol.d.ts b/libtextsecure/libsignal-protocol.d.ts
index 85731cdb7..bcdf1c51b 100644
--- a/libtextsecure/libsignal-protocol.d.ts
+++ b/libtextsecure/libsignal-protocol.d.ts
@@ -6,17 +6,6 @@ export type CipherTextObject = {
   type: SignalService.Envelope.Type;
   body: BinaryString;
 };
-export interface SignalProtocolAddressConstructor {
-  new (hexEncodedPublicKey: string, deviceId: number): SignalProtocolAddress;
-  fromString(encodedAddress: string): SignalProtocolAddress;
-}
-
-export interface SignalProtocolAddress {
-  getName(): string;
-  getDeviceId(): number;
-  toString(): string;
-  equals(other: SignalProtocolAddress): boolean;
-}
 
 export type KeyPair = {
   pubKey: ArrayBuffer;
@@ -56,7 +45,6 @@ export interface KeyHelperInterface {
 }
 
 export interface LibsignalProtocol {
-  SignalProtocolAddress: SignalProtocolAddressConstructor;
   Curve: CurveInterface;
   crypto: CryptoInterface;
   KeyHelper: KeyHelperInterface;
diff --git a/libtextsecure/libsignal-protocol.js b/libtextsecure/libsignal-protocol.js
index dfda09ecc..cc34557ce 100644
--- a/libtextsecure/libsignal-protocol.js
+++ b/libtextsecure/libsignal-protocol.js
@@ -35377,42 +35377,6 @@
     SENDING: 1,
     RECEIVING: 2
   };
-  function SignalProtocolAddress(name, deviceId) {
-    this.name = name;
-    this.deviceId = deviceId;
-  }
-
-  SignalProtocolAddress.prototype = {
-    getName: function () {
-      return this.name;
-    },
-    getDeviceId: function () {
-      return this.deviceId;
-    },
-    toString: function () {
-      return this.name + '.' + this.deviceId;
-    },
-    equals: function (other) {
-      if (!(other instanceof SignalProtocolAddress)) { return false; }
-      return other.name === this.name && other.deviceId === this.deviceId;
-    }
-  };
-
-  libsignal.SignalProtocolAddress = function (name, deviceId) {
-    var address = new SignalProtocolAddress(name, deviceId);
-
-    ['getName', 'getDeviceId', 'toString', 'equals'].forEach(function (method) {
-      this[method] = address[method].bind(address);
-    }.bind(this));
-  };
-
-  libsignal.SignalProtocolAddress.fromString = function (encodedAddress) {
-    if (typeof encodedAddress !== 'string' || !encodedAddress.match(/.*\.\d+/)) {
-      throw new Error('Invalid SignalProtocolAddress string');
-    }
-    var parts = encodedAddress.split('.');
-    return new libsignal.SignalProtocolAddress(parts[0], parseInt(parts[1]));
-  };
 
   /*
    * jobQueue manages multiple queues indexed by device to serialize
diff --git a/ts/test/session/unit/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
index 7de5e5490..d9623015d 100644
--- a/ts/test/session/unit/crypto/MessageEncrypter_test.ts
+++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
@@ -98,10 +98,6 @@ describe('MessageEncrypter', () => {
   };
 
   beforeEach(() => {
-    TestUtils.stubWindow('libsignal', {
-      SignalProtocolAddress: sandbox.stub(),
-    } as any);
-
     TestUtils.stubWindow('textsecure', {
       storage: {
         protocol: sandbox.stub(),
diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts
index e130df192..1b1273411 100644
--- a/ts/test/session/unit/sending/MessageQueue_test.ts
+++ b/ts/test/session/unit/sending/MessageQueue_test.ts
@@ -42,10 +42,6 @@ describe('MessageQueue', () => {
     // Utils Stubs
     sandbox.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber);
 
-    TestUtils.stubWindow('libsignal', {
-      SignalProtocolAddress: sandbox.stub(),
-    } as any);
-
     // Message Sender Stubs
     sendStub = sandbox.stub(MessageSender, 'send').resolves();
     messageSentHandlerFailedStub = sandbox