Merge pull request #1491 from jimmywarting/feature/remove_xtend

bye bye xtend

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/torrent.js b/lib/torrent.js
index 610b280..0213f3b 100644
--- a/lib/torrent.js
+++ b/lib/torrent.js
@@ -6,8 +6,6 @@ const ChunkStoreWriteStream = require('chunk-store-stream/write')
 const debug = require('debug')('webtorrent:torrent')
 const Discovery = require('torrent-discovery')
 const EventEmitter = require('events').EventEmitter
-const extend = require('xtend')
-const extendMutable = require('xtend/mutable')
 const fs = require('fs')
 const FSChunkStore = require('fs-chunk-store') // browser: `memory-chunk-store`
 const get = require('simple-get')
@@ -272,7 +270,7 @@ class Torrent extends EventEmitter {
     uniq(parsedTorrent.announce)
     uniq(parsedTorrent.urlList)
 
-    extendMutable(this, parsedTorrent)
+    Object.assign(this, parsedTorrent)
 
     this.magnetURI = parseTorrent.toMagnetURI(parsedTorrent)
     this.torrentFile = parseTorrent.toTorrentFile(parsedTorrent)
@@ -283,7 +281,7 @@ class Torrent extends EventEmitter {
 
     let trackerOpts = this.client.tracker
     if (trackerOpts) {
-      trackerOpts = extend(this.client.tracker, {
+      trackerOpts = Object.assign({}, this.client.tracker, {
         getAnnounceOpts: () => {
           const opts = {
             uploaded: this.uploaded,
@@ -291,11 +289,11 @@ class Torrent extends EventEmitter {
             left: Math.max(this.length - this.downloaded, 0)
           }
           if (this.client.tracker.getAnnounceOpts) {
-            extendMutable(opts, this.client.tracker.getAnnounceOpts())
+            Object.assign(opts, this.client.tracker.getAnnounceOpts())
           }
           if (this._getAnnounceOpts) {
             // TODO: consider deprecating this, as it's redundant with the former case
-            extendMutable(opts, this._getAnnounceOpts())
+            Object.assign(opts, this._getAnnounceOpts())
           }
           return opts
         }