Fix broken deps

Signed-off-by: Gustavo Sampaio <[email protected]>

Author: GustavoKatel

garbage_collector.go

@@ -9,7 +9,7 @@ import (
 
 	pb "github.com/runletapp/crabfs/protos"
 
-	syncevent "github.com/GustavoKatel/syncevent"
+	"github.com/GustavoKatel/asyncutils/event"
 	cid "github.com/ipfs/go-cid"
 	ipfsDatastore "github.com/ipfs/go-datastore"
 	ipfsDatastoreQuery "github.com/ipfs/go-datastore/query"
@@ -31,7 +31,7 @@ type garbageCollectorImpl struct {
 
 	locker *sync.RWMutex
 
-	event syncevent.SyncEvent
+	event event.Event
 }
 
 // GarbageCollectorNew basic implementation of blockstore garbage collector
@@ -46,7 +46,7 @@ func GarbageCollectorNew(ctx context.Context, interval time.Duration, ds ipfsDat
 		bs: bs,
 
 		locker: &sync.RWMutex{},
-		event:  syncevent.NewSyncEvent(false),
+		event:  event.NewEvent(false),
 	}
 
 	return gc, nil

go.mod

@@ -3,8 +3,7 @@ module github.com/runletapp/crabfs
 go 1.12
 
 require (
-	github.com/GustavoKatel/asyncwork v0.0.4
-	github.com/GustavoKatel/syncevent v0.0.1
+	github.com/GustavoKatel/asyncutils v0.0.0-20190605123401-c793d75252f9
 	github.com/gogo/protobuf v1.2.1
 	github.com/golang/mock v1.3.1
 	github.com/golang/protobuf v1.3.1

go.sum

@@ -1,10 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/GustavoKatel/asyncwork v0.0.4 h1:rqZGojz9hVuu4xzuSOMlaYuvcLPXc+mOVtXil5Xcdf0=
-github.com/GustavoKatel/asyncwork v0.0.4/go.mod h1:rHtM8M+//y+y2UmV39HxPAM7YDkpmGDfaQAl66lBooU=
-github.com/GustavoKatel/syncevent v0.0.1 h1:v2/E7JKUa/dlWqORUjuIQPZIv1G9uJCWgl40cV/NQbI=
-github.com/GustavoKatel/syncevent v0.0.1/go.mod h1:pp/N6255YF3Gl5BbSGMnKbzX1UuesSp7G1IXb2grrt8=
+github.com/GustavoKatel/asyncutils v0.0.0-20190605123401-c793d75252f9 h1:GpWTy8KFgJt2wXopC4IUO50Fc8RCEZyw66ffcwPmSEE=
+github.com/GustavoKatel/asyncutils v0.0.0-20190605123401-c793d75252f9/go.mod h1:YNTrNQtWr2UBofJtsMgMYyG/1GBOasHBlpZZ9UCHXv4=
 github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
@@ -47,6 +45,7 @@ github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
@@ -104,6 +103,7 @@ github.com/jbenet/goprocess v0.1.3 h1:YKyIEECS/XvcfHtBzxtjBBbWK+MbvA6dG8ASiqwvr1
 github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
@@ -242,6 +242,8 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a h1:/eS3yfGjQKG+9kayBkj0ip1BGhq6zJ3eaVksphxAaek=
 github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
@@ -305,6 +307,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522 h1:bhOzK9QyoD0ogCnFro1m2mz41+Ib0oOhfJnBp5MR4K4=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

host.go

@@ -15,8 +15,7 @@ import (
 	"github.com/runletapp/crabfs/options"
 	pb "github.com/runletapp/crabfs/protos"
 
-	asyncwork "github.com/GustavoKatel/asyncwork"
-	asyncworkIfaces "github.com/GustavoKatel/asyncwork/interfaces"
+	scheduler "github.com/GustavoKatel/asyncutils/scheduler"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
@@ -54,7 +53,7 @@ type hostImpl struct {
 
 	blockstore blockstore.Blockstore
 
-	provideWorker asyncworkIfaces.AsyncWork
+	provideWorker scheduler.Scheduler
 }
 
 // HostNew creates a new host
@@ -94,7 +93,7 @@ func HostNew(settings *options.Settings, ds ipfsDatastore.Batching, blockstore b
 
 // HostNewWithP2P creates a new host with an underlying p2p host
 func HostNewWithP2P(settings *options.Settings, p2pHost libp2pHost.Host, ds ipfsDatastore.Batching, blockstore blockstore.Blockstore) (interfaces.Host, error) {
-	provideWorker, err := asyncwork.NewWithContext(settings.Context)
+	provideWorker, err := scheduler.NewWithContext(settings.Context)
 	if err != nil {
 		return nil, err
 	}