Skip to content

Commit

Permalink
chore: update cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexfreska
alexfreska committed Dec 13, 2024
1 parent 8c47e17 commit d5b8e27
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 44 deletions.
6 changes: 3 additions & 3 deletions apps/hostd-e2e/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"executor": "nx:run-commands",
"options": {
"commands": [
// "cd internal/cluster && go get -u go.sia.tech/hostd@master",
// "cd internal/cluster && go get -u go.sia.tech/renterd@dev",
// "cd internal/cluster && go get -u go.sia.tech/walletd@master",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/hostd@master",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/renterd@dev",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/walletd@master",
"cd internal/cluster && go mod tidy",
"cd internal/cluster && go build -o bin/clusterd ./cmd/clusterd || echo 'BUILD FAILED'",
"git checkout internal/cluster/go.mod internal/cluster/go.sum",
Expand Down
6 changes: 3 additions & 3 deletions apps/renterd-e2e/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"executor": "nx:run-commands",
"options": {
"commands": [
// "cd internal/cluster && go get -u go.sia.tech/hostd@master",
// "cd internal/cluster && go get -u go.sia.tech/renterd@dev",
// "cd internal/cluster && go get -u go.sia.tech/walletd@master",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/hostd@master",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/renterd@dev",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/walletd@master",
"cd internal/cluster && go mod tidy",
"cd internal/cluster && go build -o bin/clusterd ./cmd/clusterd || echo 'BUILD FAILED'",
"git checkout internal/cluster/go.mod internal/cluster/go.sum",
Expand Down
6 changes: 3 additions & 3 deletions apps/walletd-e2e/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"executor": "nx:run-commands",
"options": {
"commands": [
// "cd internal/cluster && go get -u go.sia.tech/hostd@master",
// "cd internal/cluster && go get -u go.sia.tech/renterd@dev",
// "cd internal/cluster && go get -u go.sia.tech/walletd@master",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/hostd@master",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/renterd@dev",
"cd internal/cluster && GOPRIVATE=go.sia.tech go get -u go.sia.tech/walletd@master",
"cd internal/cluster && go mod tidy",
"cd internal/cluster && go build -o bin/clusterd ./cmd/clusterd || echo 'BUILD FAILED'",
"git checkout internal/cluster/go.mod internal/cluster/go.sum",
Expand Down
2 changes: 1 addition & 1 deletion internal/cluster/cmd/clusterd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func main() {
defer syncerListener.Close()

_, port, err := net.SplitHostPort(syncerListener.Addr().String())
s := syncer.New(syncerListener, cm, testutil.NewMemPeerStore(), gateway.Header{
s := syncer.New(syncerListener, cm, testutil.NewEphemeralPeerStore(), gateway.Header{
GenesisID: genesis.ID(),
UniqueID: gateway.GenerateUniqueID(),
NetAddress: "127.0.0.1:" + port,
Expand Down
20 changes: 10 additions & 10 deletions internal/cluster/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ go 1.23.1
toolchain go1.23.2

require (
go.sia.tech/cluster v0.1.3-0.20241204210241-d118340b81ac
go.sia.tech/core v0.6.2
go.sia.tech/coreutils v0.7.0
go.sia.tech/cluster v0.1.3-0.20241212220513-8d4e2ad6883d
go.sia.tech/core v0.7.4-0.20241212155227-c36fa2aec558
go.sia.tech/coreutils v0.7.1-0.20241212095636-85dd0252d9ad
go.uber.org/zap v1.27.0
)

require (
github.com/aws/aws-sdk-go v1.55.5 // indirect
github.com/cloudflare/cloudflare-go v0.110.0 // indirect
github.com/cloudflare/cloudflare-go v0.111.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/google/go-querystring v1.1.0 // indirect
Expand All @@ -30,16 +30,16 @@ require (
github.com/shopspring/decimal v1.4.0 // indirect
go.etcd.io/bbolt v1.3.11 // indirect
go.sia.tech/gofakes3 v0.0.5 // indirect
go.sia.tech/hostd v1.1.3-0.20241126153600-d590d9259987 // indirect
go.sia.tech/hostd v1.1.3-0.20241212215223-9e3440475bed // indirect
go.sia.tech/jape v0.12.1 // indirect
go.sia.tech/mux v1.3.0 // indirect
go.sia.tech/renterd v1.1.0-beta.5.0.20241203123141-50c650a896c2 // indirect
go.sia.tech/walletd v0.8.1-0.20241120185708-2f26e9b843f1 // indirect
go.sia.tech/renterd v1.1.1-0.20241212160145-9b05f245be23 // indirect
go.sia.tech/walletd v0.8.1-0.20241210081245-ca3d83da2781 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.23.0 // indirect
lukechampine.com/frand v1.5.1 // indirect
Expand Down
52 changes: 28 additions & 24 deletions internal/cluster/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/cloudflare/cloudflare-go v0.110.0 h1:aBKKUXwRWqErd4rITsnCLESOacxxset/BcpdXn23900=
github.com/cloudflare/cloudflare-go v0.110.0/go.mod h1:2ZZ+EkmThmd6pkZ56UKGXWpz2wsjeqoTg93P4+VSmMg=
github.com/cloudflare/cloudflare-go v0.111.0 h1:bFgl5OyR7iaV9DkTaoI2jU8X4rXDzEaFDaPfMTp+Ewo=
github.com/cloudflare/cloudflare-go v0.111.0/go.mod h1:w5c4Vm00JjZM+W0mPi6QOC+eWLncGQPURtgDck3z5xU=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -45,52 +45,56 @@ github.com/shabbyrobe/gocovmerge v0.0.0-20230507112040-c3350d9342df/go.mod h1:dc
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
go.sia.tech/cluster v0.1.3-0.20241204210241-d118340b81ac h1:rDTU1gOEwIlU/tHPK0rjdnXeZv6nn2Aj271mwX+D37I=
go.sia.tech/cluster v0.1.3-0.20241204210241-d118340b81ac/go.mod h1:MhFF2XgK4XaoPJ9Gm7rJaKPhulYM+BhrBztQoOV94hc=
go.sia.tech/core v0.6.2 h1:8NEjxyD93A+EhZopsBy/LvuHH+zUSjRNKnf9rXgtIwU=
go.sia.tech/core v0.6.2/go.mod h1:4v+aT/33857tMfqa5j5OYlAoLsoIrd4d7qMlgeP+VGk=
go.sia.tech/coreutils v0.7.0 h1:YpgOUD4vrpDz0KC7FJz+UCOaKaqV5EkX3gMUUmJoz5s=
go.sia.tech/coreutils v0.7.0/go.mod h1:eMoqzqO4opKQ6n9tTTxHQmccfNlj+8RFOYuDSL/Qd4g=
go.sia.tech/cluster v0.1.3-0.20241212220513-8d4e2ad6883d h1:6JJIJESNmJVO9QdKtM3DDzHHkTkb/jtfsG4RaUrxbVU=
go.sia.tech/cluster v0.1.3-0.20241212220513-8d4e2ad6883d/go.mod h1:oVDGtQcqdSPlwsdQt02TqxuTS7HqTspkXVo+0EcxFko=
go.sia.tech/core v0.7.2-0.20241210224920-0534a5928ddb h1:JHX+qWKS9sAXmEroICAu2jPQkr3CYUF7iWd/zlATsBM=
go.sia.tech/core v0.7.2-0.20241210224920-0534a5928ddb/go.mod h1:tM9tPD+1jp8d+dqVpX6idTyv5RpI0GEh5L5SyuOpqlc=
go.sia.tech/core v0.7.4-0.20241212155227-c36fa2aec558 h1:Waa5bGizNofNlgrrtLYAMK9rJtNea2D/RG/cHRGzNDA=
go.sia.tech/core v0.7.4-0.20241212155227-c36fa2aec558/go.mod h1:nKaUneURNBl2ATp3dWOd1VS7Oe6HiXzUGMIBA83uUGM=
go.sia.tech/coreutils v0.7.1-0.20241211045514-6881993d8806 h1:zmLtpmFQPKMukYMiQByZzOODvMshriyLhK12BnIsmU8=
go.sia.tech/coreutils v0.7.1-0.20241211045514-6881993d8806/go.mod h1:6z3oHrQqcLoFEAT/l6XnvOivEGXgIfWBKcq0OqsouWA=
go.sia.tech/coreutils v0.7.1-0.20241212095636-85dd0252d9ad h1:cuMwjdzF6rabxIO6cBNeKGq/NMFiJUAGnLtAqdLkhXA=
go.sia.tech/coreutils v0.7.1-0.20241212095636-85dd0252d9ad/go.mod h1:YCtWzHedl1cnM1iR64U/dfJUg5E2osMo7xAKuZKOCaM=
go.sia.tech/gofakes3 v0.0.5 h1:vFhVBUFbKE9ZplvLE2w4TQxFMQyF8qvgxV4TaTph+Vw=
go.sia.tech/gofakes3 v0.0.5/go.mod h1:LXEzwGw+OHysWLmagleCttX93cJZlT9rBu/icOZjQ54=
go.sia.tech/hostd v1.1.3-0.20241126153600-d590d9259987 h1:PBPbQ6SyZu9CEMgKo1Vou7PLDIJH4/X1Yoxqf1hPfE8=
go.sia.tech/hostd v1.1.3-0.20241126153600-d590d9259987/go.mod h1:mlX0X3KpJd/YcOSFZdY1HdEma9UHkN1W5OgHYqyVhbU=
go.sia.tech/hostd v1.1.3-0.20241212215223-9e3440475bed h1:C42AxWwwoP13EhZsdWwR17Rc9S7gXI4JnRN0AyZRxc8=
go.sia.tech/hostd v1.1.3-0.20241212215223-9e3440475bed/go.mod h1:6wTgoXKmsLQT22lUcHI4/dUcb3mhXFR+9zYWIki8Qho=
go.sia.tech/jape v0.12.1 h1:xr+o9V8FO8ScRqbSaqYf9bjj1UJ2eipZuNcI1nYousU=
go.sia.tech/jape v0.12.1/go.mod h1:wU+h6Wh5olDjkPXjF0tbZ1GDgoZ6VTi4naFw91yyWC4=
go.sia.tech/mux v1.3.0 h1:hgR34IEkqvfBKUJkAzGi31OADeW2y7D6Bmy/Jcbop9c=
go.sia.tech/mux v1.3.0/go.mod h1:I46++RD4beqA3cW9Xm9SwXbezwPqLvHhVs9HLpDtt58=
go.sia.tech/renterd v1.1.0-beta.5.0.20241203123141-50c650a896c2 h1:NOuw/yVzBKn3hhOK/RJIIsKsLoOI2tzgogu6mjLSfIw=
go.sia.tech/renterd v1.1.0-beta.5.0.20241203123141-50c650a896c2/go.mod h1:TBO18j+T36sPlOdnIndHdLcKiojpXHtyqNYm+CvI0ew=
go.sia.tech/walletd v0.8.1-0.20241120185708-2f26e9b843f1 h1:YWyRj37ZhPsHtLKgJq3gAo0zCWYl3fM24WVIBTS//yA=
go.sia.tech/walletd v0.8.1-0.20241120185708-2f26e9b843f1/go.mod h1:IMK3pD/UVpTHrExrOJLvaNSuE6lJ0pxcAvwpQ977aCM=
go.sia.tech/renterd v1.1.1-0.20241212160145-9b05f245be23 h1:xxQy3FPDEO/QVJqXRVIC9VlkAwUkEwtj6b2HbcyOVo0=
go.sia.tech/renterd v1.1.1-0.20241212160145-9b05f245be23/go.mod h1:DHf0cJuZed56t18XUU73fSYBhzlp6v48XLK4BWLyKWc=
go.sia.tech/walletd v0.8.1-0.20241210081245-ca3d83da2781 h1:3yBtVEHVj9GLZx2OmmaP3CeemZoOCgPWe9fNTzByPrI=
go.sia.tech/walletd v0.8.1-0.20241210081245-ca3d83da2781/go.mod h1:iW50oOq4TJrKC6jyfbiaiiegjzQ8rrKY5lbqwZdpwuY=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20190829051458-42f498d34c4d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
Expand Down

0 comments on commit d5b8e27

Please sign in to comment.