Use stm versions of dht and missinggo, and use anacrolix/stm

diff --git a/go.mod b/go.mod
index 0c1935b63f0e09e562d1dde3a68d1f9776bbeee1..592ecfabb3c3e1ecc390c2d08d0e4144aa017354 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -3,13 +3,13 @@ module github.com/anacrolix/torrent
 require (
        bazil.org/fuse v0.0.0-20180421153158-65cc252bf669
        github.com/alexflint/go-arg v1.1.0
-       github.com/anacrolix/dht/v2 v2.1.1-0.20191017060219-221f300f6ea8
+       github.com/anacrolix/dht/v2 v2.2.1-0.20191102112544-a3c1a8910c68
        github.com/anacrolix/envpprof v1.0.1
        github.com/anacrolix/go-libutp v1.0.2
        github.com/anacrolix/log v0.3.1-0.20191001111012-13cede988bcd
        github.com/anacrolix/missinggo v1.2.1
        github.com/anacrolix/missinggo/perf v1.0.0
-       github.com/anacrolix/missinggo/v2 v2.2.0 // indirect
+       github.com/anacrolix/missinggo/v2 v2.2.1-0.20191101011458-82a06684e1c9
        github.com/anacrolix/sync v0.2.0
        github.com/anacrolix/tagflag v1.0.1
        github.com/anacrolix/upnp v0.1.1
@@ -35,3 +35,5 @@ require (
 go 1.13
 
 replace github.com/boltdb/bolt => github.com/etcd-io/bbolt v1.3.3
+
+replace github.com/lukechampine/stm => github.com/anacrolix/stm v0.0.0-20191102104501-9bf56d22767b

diff --git a/go.sum b/go.sum
index 968214a0527c6fd7d4f0a8d97fd0a16aebee0637..3b3b0afaaec985db96c619be5727a391c210685b 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -22,6 +22,8 @@ github.com/anacrolix/dht/v2 v2.0.1 h1:gOHJ+OKqJ4Eb48OYStZm4AlWr1/nSA2TWlzb/+t36S
 github.com/anacrolix/dht/v2 v2.0.1/go.mod h1:GbTT8BaEtfqab/LPd5tY41f3GvYeii3mmDUK300Ycyo=
 github.com/anacrolix/dht/v2 v2.1.1-0.20191017060219-221f300f6ea8 h1:MG0qPJ0mqzAZM12KZ6HH31x4HRP+e6voqu5LsIw5YJM=
 github.com/anacrolix/dht/v2 v2.1.1-0.20191017060219-221f300f6ea8/go.mod h1:PEf0ghmOZEfCg4HOSNPdF0XUmGpFm/P4SHY6HYJrQIo=
+github.com/anacrolix/dht/v2 v2.2.1-0.20191102112544-a3c1a8910c68 h1:RAmA6S1ih+CbIHLsWxfrhui9JfORqYgZyL4FGmXM4aM=
+github.com/anacrolix/dht/v2 v2.2.1-0.20191102112544-a3c1a8910c68/go.mod h1:67CCde1RrOWt8G+sxEpfah0H3ru9HCkBMD2FvC1r7fI=
 github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa h1:xCaATLKmn39QqLs3tUZYr6eKvezJV+FYvVOLTklxK6U=
 github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
 github.com/anacrolix/envpprof v1.0.0 h1:AwZ+mBP4rQ5f7JSsrsN3h7M2xDW/xSE66IPVOqlnuUc=
@@ -50,10 +52,14 @@ github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy
 github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ=
 github.com/anacrolix/missinggo/v2 v2.2.0 h1:JUZh/gF/F4hXejj6I71wuO92MQDwQdLM3yRgYqTlmCg=
 github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY=
+github.com/anacrolix/missinggo/v2 v2.2.1-0.20191101011458-82a06684e1c9 h1:UHbhazB778Q10vLLC+QxTVxouI/vQ30S5dsFh0McZpo=
+github.com/anacrolix/missinggo/v2 v2.2.1-0.20191101011458-82a06684e1c9/go.mod h1:exO54zGN3NlmbfgJ3DlmyddQFSwfQbjHVT+7w8mHDew=
 github.com/anacrolix/mmsg v0.0.0-20180515031531-a4a3ba1fc8bb h1:2Or5ccMoY4Kfao+WdL2w6tpY6ZEe+2VTVbIPd7A/Ajk=
 github.com/anacrolix/mmsg v0.0.0-20180515031531-a4a3ba1fc8bb/go.mod h1:x2/ErsYUmT77kezS63+wzZp8E3byYB0gzirM/WMBLfw=
 github.com/anacrolix/mmsg v1.0.0 h1:btC7YLjOn29aTUAExJiVUhQOuf/8rhm+/nWCMAnL3Hg=
 github.com/anacrolix/mmsg v1.0.0/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc=
+github.com/anacrolix/stm v0.0.0-20191102104501-9bf56d22767b h1:R7jT5ClYKNAB7E4x3Tj07FXNtm0GF9OzUfQ1uQjxaEY=
+github.com/anacrolix/stm v0.0.0-20191102104501-9bf56d22767b/go.mod h1:+LgX5tLMH/MmapICSjBO4LY1iIMSuySbhHlquq5cjEs=
 github.com/anacrolix/sync v0.0.0-20171108081538-eee974e4f8c1/go.mod h1:+u91KiUuf0lyILI6x3n/XrW7iFROCZCG+TjgK8nW52w=
 github.com/anacrolix/sync v0.0.0-20180611022320-3c4cb11f5a01/go.mod h1:+u91KiUuf0lyILI6x3n/XrW7iFROCZCG+TjgK8nW52w=
 github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778 h1:XpCDEixzXOB8yaTW/4YBzKrJdMcFI0DzpPTYNv75wzk=
@@ -76,6 +82,8 @@ github.com/anacrolix/upnp v0.1.1/go.mod h1:LXsbsp5h+WGN7YR+0A7iVXm5BL1LYryDev1zu
 github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572 h1:kpt6TQTVi6gognY+svubHfxxpq0DLU9AfTQyZVc3UOc=
 github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572/go.mod h1:MDwc+vsGEq7RMw6lr2GKOEqjWny5hO5OZXRVNaBJ2Dk=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/benbjohnson/immutable v0.2.0 h1:t0rW3lNFwfQ85IDO1mhMbumxdVSti4nnVaal4r45Oio=
+github.com/benbjohnson/immutable v0.2.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2 h1:1B/+1BcRhOMG1KH/YhNIU8OppSWk5d/NGyfRla88CuY=
 github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo=
@@ -164,6 +172,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lukechampine/stm v0.0.0-20191022212748-05486c32d236 h1:kYGljja/OYeRs672gWqkHNMDVAtLN8/0UZpJNDCQ3s4=
+github.com/lukechampine/stm v0.0.0-20191022212748-05486c32d236/go.mod h1:wTLsd5FC9rts7GkMpsPGk64CIuea+03yaLAp19Jmlg8=
 github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-sqlite3 v1.7.0 h1:CiYZ8slwBLIMkDbDJCF+Zd2M8bZ1Gz02TMsm1V33Lk0=