Skip to content

Commit

Permalink
Merge pull request #35 from renproject/feat/surge-1.2.4
Browse files Browse the repository at this point in the history 
Update to use surge v1.2.5
  • Loading branch information
@jazg
jazg authored Jul 8, 2020
2 parents e47c95e + d86ae46 commit 49fc7bd
Show file tree
Hide file tree
Showing 17 changed files with 276 additions and 255 deletions.
6 changes: 3 additions & 3 deletions aw.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func New() *Builder {
// By default, the content resolver is nil, meaning content will only be
// stored in-memory.
builder.dht = dht.New(
id.NewSignatory(&builder.handshaker.PrivKey.PublicKey),
id.NewSignatory((*id.PubKey)(&builder.handshaker.PrivKey.PublicKey)),
builder.contentResolver,
)
return builder
Expand All @@ -49,7 +49,7 @@ func New() *Builder {
func (builder *Builder) WithPrivKey(privKey *id.PrivKey) *Builder {
builder.handshaker.PrivKey = privKey
builder.dht = dht.New(
id.NewSignatory(&builder.handshaker.PrivKey.PublicKey),
id.NewSignatory((*id.PubKey)(&builder.handshaker.PrivKey.PublicKey)),
builder.contentResolver,
)
if err := builder.peer.Addr.Sign(builder.handshaker.PrivKey); err != nil {
Expand All @@ -61,7 +61,7 @@ func (builder *Builder) WithPrivKey(privKey *id.PrivKey) *Builder {
func (builder *Builder) WithContentResolver(contentResolver dht.ContentResolver) *Builder {
builder.contentResolver = contentResolver
builder.dht = dht.New(
id.NewSignatory(&builder.handshaker.PrivKey.PublicKey),
id.NewSignatory((*id.PubKey)(&builder.handshaker.PrivKey.PublicKey)),
builder.contentResolver,
)
return builder
Expand Down
14 changes: 7 additions & 7 deletions dht/dht_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var _ = Describe("DHT", func() {
ok := table.InsertAddr(addr)
Expect(ok).To(BeTrue())

signatory := id.NewSignatory(&privKey.PublicKey)
signatory := id.NewSignatory((*id.PubKey)(&privKey.PublicKey))
newAddr, ok := table.Addr(signatory)
Expect(ok).To(BeTrue())
Expect(newAddr).To(Equal(addr))
Expand Down Expand Up @@ -116,7 +116,7 @@ var _ = Describe("DHT", func() {

// Try to delete the address prior to inserting to make sure
// it does not panic.
signatory := id.NewSignatory(&privKey.PublicKey)
signatory := id.NewSignatory((*id.PubKey)(&privKey.PublicKey))
table.DeleteAddr(signatory)

// Insert the address.
Expand Down Expand Up @@ -238,7 +238,7 @@ var _ = Describe("DHT", func() {
Context("when initialising a DHT without a content resolver", func() {
It("should panic", func() {
privKey := id.NewPrivKey()
identity := id.NewSignatory(&privKey.PublicKey)
identity := id.NewSignatory((*id.PubKey)(&privKey.PublicKey))
Expect(func() { dht.New(identity, nil) }).To(Panic())
})
})
Expand All @@ -250,7 +250,7 @@ var _ = Describe("DHT", func() {
contentCh := make(chan id.Hash)

privKey := id.NewPrivKey()
identity := id.NewSignatory(&privKey.PublicKey)
identity := id.NewSignatory((*id.PubKey)(&privKey.PublicKey))
resolver := dhtutil.NewChannelResolver(insertCh, deleteCh, contentCh)
table := dht.New(identity, resolver)

Expand Down Expand Up @@ -369,7 +369,7 @@ var _ = Describe("DHT", func() {
signatories := make([]id.Signatory, numSignatories)
for i := 0; i < numSignatories; i++ {
privKey := id.NewPrivKey()
signatories[i] = id.NewSignatory(&privKey.PublicKey)
signatories[i] = id.NewSignatory((*id.PubKey)(&privKey.PublicKey))
}

hash := table.AddSubnet(signatories)
Expand All @@ -391,7 +391,7 @@ var _ = Describe("DHT", func() {
signatories := make([]id.Signatory, numSignatories)
for i := 0; i < numSignatories; i++ {
privKey := id.NewPrivKey()
signatories[i] = id.NewSignatory(&privKey.PublicKey)
signatories[i] = id.NewSignatory((*id.PubKey)(&privKey.PublicKey))
}

hash := table.AddSubnet(signatories)
Expand Down Expand Up @@ -420,7 +420,7 @@ var _ = Describe("DHT", func() {

func initDHT() (dht.DHT, id.Signatory) {
privKey := id.NewPrivKey()
identity := id.NewSignatory(&privKey.PublicKey)
identity := id.NewSignatory((*id.PubKey)(&privKey.PublicKey))
resolver := dht.NewDoubleCacheContentResolver(dht.DefaultDoubleCacheContentResolverOptions(), nil)
return dht.New(identity, resolver), identity
}
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.12

require (
github.com/ethereum/go-ethereum v1.9.10
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.8.1
github.com/renproject/id v0.3.3
github.com/renproject/surge v1.1.3
github.com/onsi/ginkgo v1.12.3
github.com/onsi/gomega v1.10.1
github.com/renproject/id v0.4.2
github.com/renproject/surge v1.2.5
github.com/sirupsen/logrus v1.4.2
go.uber.org/zap v1.15.0
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
Expand Down
42 changes: 42 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
Expand All @@ -105,12 +107,19 @@ github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c h1:zqAKixg3cTcIa
github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
Expand Down Expand Up @@ -166,6 +175,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
Expand All @@ -176,11 +187,17 @@ github.com/onsi/ginkgo v1.9.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.12.3 h1:+RYp9QczoWz9zfUyLP/5SLXQVhfr6gZOoKGfQqHuLZQ=
github.com/onsi/ginkgo v1.12.3/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34=
github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc=
github.com/openconfig/reference v0.0.0-20190727015836-8dfd928c9696/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
Expand Down Expand Up @@ -222,6 +239,8 @@ github.com/renproject/id v0.3.1 h1:92CbN8sQTlMIXid69fOJXEkES67uJDORkobRvqoVvJs=
github.com/renproject/id v0.3.1/go.mod h1:xEoepH7Jze4l+gJxzSh9yRt634XyiM1j9si+WS2Emsc=
github.com/renproject/id v0.3.3 h1:IiJR1mJ8PvAds+zRz1gxukbWKJJrYQSUnNdihOsaGAY=
github.com/renproject/id v0.3.3/go.mod h1:BmNHJVfkLsDcvQFHAAPxhhv2KUvWhT4xXFo1Phmp8Kw=
github.com/renproject/id v0.4.2 h1:XseNDPPCJtsZjIWR7Qgf+zxy0Gt5xsLrfwpQxJt5wFQ=
github.com/renproject/id v0.4.2/go.mod h1:bCzV4zZkyWetf0GvhJxMT9HQNnGUwzQpImtXOUXqq0k=
github.com/renproject/kv v1.1.2 h1:P18yHdDVJTEZ9yeyx6o82ICY1m6f+VdtAt/ouZez+AU=
github.com/renproject/kv v1.1.2/go.mod h1:78bvdAtYiYxCoT9ihVhl8qdmjl7s9fST/FkRLnZ6rXY=
github.com/renproject/phi v0.1.0 h1:ZOn7QeDribk/uV46OhQWcTLxyuLg7P+xR1Hfl5cOQuI=
Expand All @@ -233,6 +252,11 @@ github.com/renproject/surge v1.1.2 h1:Yy3pTlRyaMJGLfn64JHgCnWs3cWbRJjE+aFxZXRGfW
github.com/renproject/surge v1.1.2/go.mod h1:UnnFYpLSD0T9MzCcyHjbNdmxiQsDVyBDCuqcbhcaLCY=
github.com/renproject/surge v1.1.3 h1:nCN3yWUbIbSDWyMaU6aCIidCE15yEcZb8Bcuziog/wU=
github.com/renproject/surge v1.1.3/go.mod h1:UnnFYpLSD0T9MzCcyHjbNdmxiQsDVyBDCuqcbhcaLCY=
github.com/renproject/surge v1.2.2/go.mod h1:jNVsKCM3/2PAllkc2cx7g2saG9NrHRX5x20I/TDMXOs=
github.com/renproject/surge v1.2.4 h1:TnlbFQEbcyHbdnZx/PGOaexxaNRP2/l6hSzbs5jnJw0=
github.com/renproject/surge v1.2.4/go.mod h1:jNVsKCM3/2PAllkc2cx7g2saG9NrHRX5x20I/TDMXOs=
github.com/renproject/surge v1.2.5 h1:P2qKZxWiKrC8hw7in/hXVtic+dGkhd1M0H/1Lj+fJnw=
github.com/renproject/surge v1.2.5/go.mod h1:jNVsKCM3/2PAllkc2cx7g2saG9NrHRX5x20I/TDMXOs=
github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
github.com/robertkrimen/otto v0.0.0-20170205013659-6a77b7cbc37d/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
Expand Down Expand Up @@ -313,6 +337,8 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2 h1:4dVFTC832rPn4pomLSz1vA+are2+dU19w1H8OngV7nc=
golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -333,8 +359,14 @@ golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8 h1:41hwlulw1prEMBxLQSlMSux1zxJf07B3WPsdjJlKZxE=
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
Expand All @@ -349,9 +381,17 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand All @@ -376,6 +416,8 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
8 changes: 4 additions & 4 deletions gossip/gossip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func (g *Gossiper) DidReceivePush(version wire.Version, data []byte, from id.Sig
//

pushV1 := wire.PushV1{}
if err := surge.FromBinary(data, &pushV1); err != nil {
if err := surge.FromBinary(&pushV1, data); err != nil {
return wire.Message{}, fmt.Errorf("unmarshaling push: %v", err)
}

Expand Down Expand Up @@ -230,7 +230,7 @@ func (g *Gossiper) DidReceivePushAck(version wire.Version, data []byte, from id.
//

pushAckV1 := wire.PushAckV1{}
if err := surge.FromBinary(data, &pushAckV1); err != nil {
if err := surge.FromBinary(&pushAckV1, data); err != nil {
g.opts.Logger.Fatalf("unmarshaling push ack: %v", err)
}

Expand All @@ -251,7 +251,7 @@ func (g *Gossiper) DidReceivePull(version wire.Version, data []byte, from id.Sig
//

pullV1 := wire.PullV1{}
if err := surge.FromBinary(data, &pullV1); err != nil {
if err := surge.FromBinary(&pullV1, data); err != nil {
return wire.Message{}, fmt.Errorf("unmarshaling pull: %v", err)
}

Expand Down Expand Up @@ -295,7 +295,7 @@ func (g *Gossiper) DidReceivePullAck(version wire.Version, data []byte, from id.
return nil
}
pullAckV1 := wire.PullAckV1{}
if err := surge.FromBinary(data, &pullAckV1); err != nil {
if err := surge.FromBinary(&pullAckV1, data); err != nil {
return fmt.Errorf("unmarshaling pull ack: %v", err)
}

Expand Down
10 changes: 5 additions & 5 deletions gossip/gossip_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ var _ = Describe("Gossip", func() {
subnet := nodes[syncIndex].dht.AddSubnet(signatories)

// Sync data from the subnet and ensure it is the same.
innerCtx, innerCancel := context.WithTimeout(ctx, 100*time.Millisecond)
innerCtx, innerCancel := context.WithTimeout(ctx, time.Second)
defer innerCancel()

newData, err := nodes[syncIndex].gossiper.Sync(innerCtx, subnet, hash, dataType)
Expand Down Expand Up @@ -205,7 +205,7 @@ var _ = Describe("Gossip", func() {

// Sync data with an unknown hash from the subnet and ensure
// it returns an error.
innerCtx, innerCancel := context.WithTimeout(ctx, 100*time.Millisecond)
innerCtx, innerCancel := context.WithTimeout(ctx, time.Second)
defer innerCancel()

_, err := nodes[syncIndex].gossiper.Sync(innerCtx, subnet, hash, dataType)
Expand Down Expand Up @@ -237,7 +237,7 @@ var _ = Describe("Gossip", func() {
}

// Sync data from the default subnet and ensure it is the same.
innerCtx, innerCancel := context.WithTimeout(ctx, 100*time.Millisecond)
innerCtx, innerCancel := context.WithTimeout(ctx, time.Second)
defer innerCancel()

newData, err := nodes[syncIndex].gossiper.Sync(innerCtx, gossip.DefaultSubnet, hash, dataType)
Expand Down Expand Up @@ -280,7 +280,7 @@ var _ = Describe("Gossip", func() {
}

// Sync data from the subnet and ensure it is the same.
innerCtx, innerCancel := context.WithTimeout(ctx, 100*time.Millisecond)
innerCtx, innerCancel := context.WithTimeout(ctx, time.Second)
defer innerCancel()

wg := new(sync.WaitGroup)
Expand Down Expand Up @@ -318,7 +318,7 @@ func initNodes(ctx context.Context, n uint, alpha int) []node {
nodes := make([]node, n)
for i := range nodes {
privKey := id.NewPrivKey()
signatory := id.NewSignatory(&privKey.PublicKey)
signatory := id.NewSignatory((*id.PubKey)(&privKey.PublicKey))
host := "0.0.0.0"
port := uint16(3000 + rand.Int()%3000)

Expand Down
Loading

0 comments on commit 49fc7bd

Please sign in to comment.