From 06a7c872584e618eaf85116a28be70e081559627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9E=E3=83=AA=E3=82=A6=E3=82=B9?= Date: Thu, 24 Mar 2022 15:45:15 -0500 Subject: [PATCH 1/4] go-orbit-db upgrade --- database/database.go | 7 +++++-- go.mod | 22 +++++++++++----------- go.sum | 37 ++++++++++++++++++++++--------------- superhighway84.go | 9 +++++++-- 4 files changed, 45 insertions(+), 30 deletions(-) diff --git a/database/database.go b/database/database.go index b234cf7..57e984c 100644 --- a/database/database.go +++ b/database/database.go @@ -110,7 +110,7 @@ func(db *Database) connectToPeers() error { defer wg.Done() err := db.IPFSCoreAPI.Swarm().Connect(db.ctx, *peerInfo) if err != nil { - db.Logger.Debug("failed to connect", zap.String("peerID", peerInfo.ID.String()), zap.Error(err)) + db.Logger.Error("failed to connect", zap.String("peerID", peerInfo.ID.String()), zap.Error(err)) } else { db.Logger.Debug("connected!", zap.String("peerID", peerInfo.ID.String())) } @@ -159,6 +159,7 @@ func (db *Database) Connect(onReady func(address string)) (error) { // if db.Init { err = db.init() if err != nil { + db.Logger.Error("%s", zap.Error(err)) return err } // } else { @@ -171,7 +172,7 @@ func (db *Database) Connect(onReady func(address string)) (error) { // go func() { err = db.connectToPeers() if err != nil { - db.Logger.Debug("failed to connect: %s", zap.Error(err)) + db.Logger.Error("failed to connect: %s", zap.Error(err)) } else { db.Logger.Debug("connected to peer!") } @@ -198,10 +199,12 @@ func (db *Database) Connect(onReady func(address string)) (error) { err = db.Store.Load(db.ctx, -1) if err != nil { + db.Logger.Error("%s", zap.Error(err)) // TODO: clean up return err } + db.Logger.Debug("connect done") return nil } diff --git a/go.mod b/go.mod index 459df6f..af5a32e 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/mrusme/superhighway84 go 1.17 require ( - berty.tech/go-orbit-db v1.14.1 - github.com/BurntSushi/toml v0.4.1 + berty.tech/go-orbit-db v1.15.1 + github.com/BurntSushi/toml v1.0.0 github.com/eliukblau/pixterm v1.3.1 github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 - github.com/go-playground/validator/v10 v10.9.0 + github.com/go-playground/validator/v10 v10.10.1 github.com/google/uuid v1.3.0 github.com/ipfs/go-ipfs v0.11.0 github.com/ipfs/go-ipfs-config v0.18.0 @@ -16,14 +16,14 @@ require ( github.com/libp2p/go-libp2p-core v0.13.0 github.com/mitchellh/mapstructure v1.4.3 github.com/mrusme/go-poolsuite v0.0.0-20220102191132-9dd8514d3e05 - github.com/rivo/tview v0.0.0-20211202162923-2a6de950f73b + github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8 github.com/tidwall/buntdb v1.2.9 go.uber.org/zap v1.21.0 ) require ( bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc // indirect - berty.tech/go-ipfs-log v1.6.0 // indirect + berty.tech/go-ipfs-log v1.7.0 // indirect github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect github.com/Stebalien/go-bitfield v0.0.1 // indirect github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect @@ -54,7 +54,6 @@ require ( github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.1 // indirect github.com/google/gopacket v1.1.19 // indirect @@ -165,10 +164,11 @@ require ( github.com/libp2p/go-ws-transport v0.5.0 // indirect github.com/libp2p/go-yamux/v2 v2.3.0 // indirect github.com/libp2p/zeroconf/v2 v2.1.1 // indirect - github.com/lucas-clemente/quic-go v0.24.0 // indirect + github.com/lucas-clemente/quic-go v0.26.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect - github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect - github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect + github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect + github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect + github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect @@ -226,12 +226,12 @@ require ( go.uber.org/fx v1.15.0 // indirect go.uber.org/multierr v1.7.0 // indirect go4.org v0.0.0-20200411211856-f5505b9728dd // indirect - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect golang.org/x/image v0.0.0-20191206065243-da761ea9ff43 // indirect golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 // indirect golang.org/x/mod v0.4.2 // indirect - golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect + golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/sys v0.0.0-20211025112917-711f33c9992c // indirect golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect diff --git a/go.sum b/go.sum index 02556ab..3ad4b1b 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc h1:utDghgcjE8u+EBjHOgYT+dJPcnDF05KqWMBcjuJy510= bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= -berty.tech/go-ipfs-log v1.6.0 h1:z7v597EgOl851hE1P7k+J/us6w3sO3f0DLsVJlc9KAQ= -berty.tech/go-ipfs-log v1.6.0/go.mod h1:iUEkY66ZdeK01L/MQFUsHz49wYR1HdROuQ64EVGSBDE= -berty.tech/go-orbit-db v1.14.1 h1:kVSATX+hiqYdwyq+RSh/xrXarD5EUhcSEnDpNKxwoJ8= -berty.tech/go-orbit-db v1.14.1/go.mod h1:dqfRSCVO1xSFv9Bq2c8JrDT5C43nRYd3NFMh93yPriM= +berty.tech/go-ipfs-log v1.7.0 h1:BP4+W5X7tCxbXrihAOjTVlgXXncV1kUlf4zyghSzFQw= +berty.tech/go-ipfs-log v1.7.0/go.mod h1:J0T24JAh333q0ljTtIr7hgeeWxDNQb9ygY2aAxX6rYA= +berty.tech/go-orbit-db v1.15.1 h1:TmptlaF4GV62dIL0udrK5kr/s/6rruf2f6E6YiK8HFI= +berty.tech/go-orbit-db v1.15.1/go.mod h1:E5bJkcjpYGGgd+XvEQLcoVnWnVSzGYGJnjBRarSJRMg= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -50,8 +50,8 @@ github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOv github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M= github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw= -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= +github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= @@ -246,8 +246,8 @@ github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.9.0 h1:NgTtmN58D0m8+UuxtYmGztBJB7VnPgjj221I1QHci2A= -github.com/go-playground/validator/v10 v10.9.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-playground/validator/v10 v10.10.1 h1:uA0+amWMiglNZKZ9FJRKUAe9U3RX91eVn1JYXMWt7ig= +github.com/go-playground/validator/v10 v10.10.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= @@ -262,8 +262,6 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259 h1:ZHJ7+IGpuOXtVf6Zk/a3WuHQgkC+vXwaqfUBDFwahtI= -github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259/go.mod h1:9Qcha0gTWLw//0VNka1Cbnjvg3pNKGFdAm7E9sBabxE= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -1020,6 +1018,8 @@ github.com/lucas-clemente/quic-go v0.21.2/go.mod h1:vF5M1XqhBAHgbjKcJOXY3JZz3GP0 github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g= github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= +github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A= +github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= @@ -1036,9 +1036,15 @@ github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1j github.com/marten-seemann/qtls-go1-15 v0.1.5/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= +github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ= +github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= +github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc= +github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= +github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y= +github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -1280,8 +1286,8 @@ github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rivo/tview v0.0.0-20211202162923-2a6de950f73b h1:EMgbQ+bOHWkl0Ptano8M0yrzVZkxans+Vfv7ox/EtO8= -github.com/rivo/tview v0.0.0-20211202162923-2a6de950f73b/go.mod h1:WIfMkQNY+oq/mWwtsjOYHIZBuwthioY2srOmljJkTnk= +github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8 h1:xe+mmCnDN82KhC010l3NfYlA8ZbOuzbXAzSYBa6wbMc= +github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8/go.mod h1:WIfMkQNY+oq/mWwtsjOYHIZBuwthioY2srOmljJkTnk= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -1515,10 +1521,10 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1615,8 +1621,9 @@ golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= diff --git a/superhighway84.go b/superhighway84.go index b69e523..983abab 100644 --- a/superhighway84.go +++ b/superhighway84.go @@ -32,7 +32,7 @@ func NewLogger(filename string) (*zap.Logger, error) { }) } - cfg := zap.NewProductionConfig() + cfg := zap.NewDevelopmentConfig() if runtime.GOOS == "windows" { cfg.OutputPaths = []string{ "stdout", @@ -90,10 +90,13 @@ func main() { TUI.CallbackRefreshArticles = func() (error) { articles, articlesRoots, err = db.ListArticles() + logger.Error("%s", zap.Error(err)) return err } TUI.CallbackSubmitArticle = func(article *models.Article) (error) { - return db.SubmitArticle(article) + err := db.SubmitArticle(article) + logger.Error("%s", zap.Error(err)) + return err } err = db.Connect(func(address string) { @@ -123,6 +126,8 @@ func main() { connections, err := db.IPFSCoreAPI.Swarm().Peers(context.Background()) if err == nil { peers = len(connections) + } else { + logger.Error("%s", zap.Error(err)) } TUI.SetStats(int64(peers), int64(bw.RateIn), int64(bw.RateOut), bw.TotalIn , bw.TotalOut) time.Sleep(time.Second * 5) From af396ba6025e3202b6f11cfc628573daa552845a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9E=E3=83=AA=E3=82=A6=E3=82=B9?= Date: Mon, 28 Mar 2022 14:31:45 -0500 Subject: [PATCH 2/4] Tried update to go-orbit-db- v1.16.0 --- go.mod | 9 ++++----- go.sum | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index af5a32e..3b2c7d7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/mrusme/superhighway84 go 1.17 require ( - berty.tech/go-orbit-db v1.15.1 + berty.tech/go-orbit-db v1.16.0 github.com/BurntSushi/toml v1.0.0 github.com/eliukblau/pixterm v1.3.1 github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 @@ -164,11 +164,10 @@ require ( github.com/libp2p/go-ws-transport v0.5.0 // indirect github.com/libp2p/go-yamux/v2 v2.3.0 // indirect github.com/libp2p/zeroconf/v2 v2.1.1 // indirect - github.com/lucas-clemente/quic-go v0.26.0 // indirect + github.com/lucas-clemente/quic-go v0.24.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect - github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect - github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect - github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect + github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect + github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect diff --git a/go.sum b/go.sum index 3ad4b1b..5519db4 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ berty.tech/go-ipfs-log v1.7.0 h1:BP4+W5X7tCxbXrihAOjTVlgXXncV1kUlf4zyghSzFQw= berty.tech/go-ipfs-log v1.7.0/go.mod h1:J0T24JAh333q0ljTtIr7hgeeWxDNQb9ygY2aAxX6rYA= berty.tech/go-orbit-db v1.15.1 h1:TmptlaF4GV62dIL0udrK5kr/s/6rruf2f6E6YiK8HFI= berty.tech/go-orbit-db v1.15.1/go.mod h1:E5bJkcjpYGGgd+XvEQLcoVnWnVSzGYGJnjBRarSJRMg= +berty.tech/go-orbit-db v1.16.0 h1:Ung71M704uOrcIg6OvG/vwvXNVwIZ9YZviJYNdd7nGY= +berty.tech/go-orbit-db v1.16.0/go.mod h1:E5bJkcjpYGGgd+XvEQLcoVnWnVSzGYGJnjBRarSJRMg= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= From d77e3f682385a6817d8586c11e81c1f7b850874b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9E=E3=83=AA=E3=82=A6=E3=82=B9?= Date: Wed, 30 Mar 2022 12:23:12 -0500 Subject: [PATCH 3/4] Updated to go-orbit-db v1.16.0 --- go.mod | 9 +++++---- go.sum | 6 ++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 3b2c7d7..f5ac10b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/mrusme/superhighway84 go 1.17 require ( - berty.tech/go-orbit-db v1.16.0 + berty.tech/go-orbit-db v1.16.1 github.com/BurntSushi/toml v1.0.0 github.com/eliukblau/pixterm v1.3.1 github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 @@ -164,10 +164,11 @@ require ( github.com/libp2p/go-ws-transport v0.5.0 // indirect github.com/libp2p/go-yamux/v2 v2.3.0 // indirect github.com/libp2p/zeroconf/v2 v2.1.1 // indirect - github.com/lucas-clemente/quic-go v0.24.0 // indirect + github.com/lucas-clemente/quic-go v0.26.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect - github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect - github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect + github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect + github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect + github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect diff --git a/go.sum b/go.sum index 5519db4..23dfadd 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,8 @@ bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc h1:utDghgcjE8u+EBjHOgYT+dJPcnD bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= berty.tech/go-ipfs-log v1.7.0 h1:BP4+W5X7tCxbXrihAOjTVlgXXncV1kUlf4zyghSzFQw= berty.tech/go-ipfs-log v1.7.0/go.mod h1:J0T24JAh333q0ljTtIr7hgeeWxDNQb9ygY2aAxX6rYA= -berty.tech/go-orbit-db v1.15.1 h1:TmptlaF4GV62dIL0udrK5kr/s/6rruf2f6E6YiK8HFI= -berty.tech/go-orbit-db v1.15.1/go.mod h1:E5bJkcjpYGGgd+XvEQLcoVnWnVSzGYGJnjBRarSJRMg= -berty.tech/go-orbit-db v1.16.0 h1:Ung71M704uOrcIg6OvG/vwvXNVwIZ9YZviJYNdd7nGY= -berty.tech/go-orbit-db v1.16.0/go.mod h1:E5bJkcjpYGGgd+XvEQLcoVnWnVSzGYGJnjBRarSJRMg= +berty.tech/go-orbit-db v1.16.1 h1:AXPD6y32Lab4Rk3y9qBU9GCspqV6hXK0VlaDrOW7wrg= +berty.tech/go-orbit-db v1.16.1/go.mod h1:E5bJkcjpYGGgd+XvEQLcoVnWnVSzGYGJnjBRarSJRMg= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= From b0371b59ee0ce1b84d03c4f10e4362baef1a3b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9E=E3=83=AA=E3=82=A6=E3=82=B9?= Date: Wed, 20 Apr 2022 17:44:40 -0500 Subject: [PATCH 4/4] Refactored events according to https://github.com/berty/go-orbit-db/issues/100 --- database/database.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/database/database.go b/database/database.go index 57e984c..964c638 100644 --- a/database/database.go +++ b/database/database.go @@ -7,7 +7,6 @@ import ( orbitdb "berty.tech/go-orbit-db" "berty.tech/go-orbit-db/accesscontroller" - "berty.tech/go-orbit-db/events" "berty.tech/go-orbit-db/iface" "berty.tech/go-orbit-db/stores" "berty.tech/go-orbit-db/stores/documentstore" @@ -16,6 +15,7 @@ import ( icore "github.com/ipfs/interface-go-ipfs-core" "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p-core/event" "github.com/mitchellh/mapstructure" "go.uber.org/zap" @@ -37,7 +37,7 @@ type Database struct { OrbitDB orbitdb.OrbitDB Store orbitdb.DocumentStore - StoreEventChan <-chan events.Event + Events event.Subscription } func (db *Database) init() (error) { @@ -79,7 +79,7 @@ func (db *Database) init() (error) { return err } - db.StoreEventChan = db.Store.Subscribe(db.ctx) + db.Events, err = db.Store.EventBus().Subscribe(new(stores.EventReady)) return nil } @@ -156,6 +156,7 @@ func NewDatabase( func (db *Database) Connect(onReady func(address string)) (error) { var err error + // if db.Init { err = db.init() if err != nil { @@ -186,12 +187,13 @@ func (db *Database) Connect(onReady func(address string)) (error) { go func() { for { - for ev := range db.StoreEventChan { + for ev := range db.Events.Out() { db.Logger.Debug("got event", zap.Any("event", ev)) switch ev.(type) { - case *stores.EventReady: + case stores.EventReady: db.URI = db.Store.Address().String() onReady(db.URI) + continue } } } @@ -209,6 +211,8 @@ func (db *Database) Connect(onReady func(address string)) (error) { } func (db *Database) Disconnect() { + db.Events.Close() + db.Store.Close() db.OrbitDB.Close() }