Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vet fix & deps #1521

Merged
merged 1 commit into from
May 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion consensus/cuckoo/consensus.go
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,6 @@ func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header,
//}

if len(uncles) > 0 {

for _, uncle := range uncles {
r.Add(uncle.Number, big8)
r.Sub(r, header.Number)
Expand Down
8 changes: 4 additions & 4 deletions ctxc/downloader/downloader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1504,17 +1504,17 @@ func TestDeliverHeadersHang(t *testing.T) {
protocol int
syncMode SyncMode
}{
{62, FullSync},
{63, FullSync},
{63, FastSync},
//{62, FullSync},
//{63, FullSync},
//{63, FastSync},
{64, FullSync},
{64, FastSync},
{65, FullSync},
{65, FastSync},
}
for _, tc := range testCases {
t.Run(fmt.Sprintf("protocol %d mode %v", tc.protocol, tc.syncMode), func(t *testing.T) {
t.Parallel()
//t.Parallel()
testDeliverHeadersHang(t, tc.protocol, tc.syncMode)
})
}
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1
github.com/CortexFoundation/inference v1.0.2-0.20230307032835-9197d586a4e8
github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66
github.com/CortexFoundation/torrentfs v1.0.43-0.20230424145059-4a78d96b8709
github.com/CortexFoundation/torrentfs v1.0.43-0.20230430013533-eb5ca1c4750a
github.com/VictoriaMetrics/fastcache v1.12.1
github.com/arsham/figurine v1.3.0
github.com/aws/aws-sdk-go-v2 v1.17.7
Expand All @@ -17,7 +17,7 @@ require (
github.com/cespare/cp v1.1.1
github.com/charmbracelet/bubbletea v0.23.2
github.com/cloudflare/cloudflare-go v0.57.1
github.com/cockroachdb/pebble v0.0.0-20230420172751-f87a15b23a26
github.com/cockroachdb/pebble v0.0.0-20230428220915-dc0efbd4333b
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/deckarep/golang-set/v2 v2.3.0
github.com/docker/docker v23.0.2+incompatible
Expand Down
10 changes: 5 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66/go.mod h1:
github.com/CortexFoundation/torrentfs v1.0.13-0.20200623060705-ce027f43f2f8/go.mod h1:Ma+tGhPPvz4CEZHaqEJQMOEGOfHeQBiAoNd1zyc/w3Q=
github.com/CortexFoundation/torrentfs v1.0.14-0.20200703071639-3fcabcabf274/go.mod h1:qnb3YlIJmuetVBtC6Lsejr0Xru+1DNmDCdTqnwy7lhk=
github.com/CortexFoundation/torrentfs v1.0.20-0.20200810031954-d36d26f82fcc/go.mod h1:N5BsicP5ynjXIi/Npl/SRzlJ630n1PJV2sRj0Z0t2HA=
github.com/CortexFoundation/torrentfs v1.0.43-0.20230424145059-4a78d96b8709 h1:FIoIkOouFF/Z76EONdZOwVqPEDYZqErd/C3Xgz80O+4=
github.com/CortexFoundation/torrentfs v1.0.43-0.20230424145059-4a78d96b8709/go.mod h1:KwAVwauTMrKxfWfodK5lqPSlT2Lz/c61AAkEU5kknd4=
github.com/CortexFoundation/torrentfs v1.0.43-0.20230430013533-eb5ca1c4750a h1:vGsEFb94z7Ap5RK7gQp5O0LRn0TfQ97ratluEKxHaO4=
github.com/CortexFoundation/torrentfs v1.0.43-0.20230430013533-eb5ca1c4750a/go.mod h1:eOqycAWG+Zg+ZlkjOj/YLPnnYrry/z9HZRVlqGUGMPY=
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
Expand Down Expand Up @@ -342,15 +342,15 @@ github.com/cloudflare/cloudflare-go v0.57.1/go.mod h1:cD8AqNMMaL1A0Sj9XKo3Xu9ZVH
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA=
github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4=
github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8=
github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk=
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/pebble v0.0.0-20230420172751-f87a15b23a26 h1:B36ZLUlDXPaOUofmJW/usmYqMJMJFH+bRzHX5HbBjeY=
github.com/cockroachdb/pebble v0.0.0-20230420172751-f87a15b23a26/go.mod h1:9lRMC4XN3/BLPtIp6kAKwIaHu369NOf2rMucPzipz50=
github.com/cockroachdb/pebble v0.0.0-20230428220915-dc0efbd4333b h1:s8Bb/AsUb/WuhLTs0ENm9I0dxthCVp4QR79Q1a9ZK8I=
github.com/cockroachdb/pebble v0.0.0-20230428220915-dc0efbd4333b/go.mod h1:TkdVsGYRqtULUppt2RbC+YaKtTHnHoWa2apfFrSKABw=
github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
Expand Down
2 changes: 1 addition & 1 deletion params/protocol_params.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const (
SeedingBlks = 6 // TESTING: for torrent seed spreading
MatureBlks = 100 // Blocks between model uploading tx and model ready for use.
// For the full node to synchronize the models
BernardMatureBlks = 10 // TESTING: For the full node to synchronize the models, in dolores testnet
BernardMatureBlks = 10 // TESTING: For the full node to synchronize the models, in bernard testnet
DoloresMatureBlks = 1 // TESTING: For the full node to synchronize the models, in dolores testnet
ExpiredBlks = 1000000000000000000 // TESTING: Model expire blocks. Not effective. 8409600

Expand Down
12 changes: 7 additions & 5 deletions vendor/github.com/cockroachdb/pebble/db.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 41 additions & 3 deletions vendor/github.com/cockroachdb/pebble/ingest.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 12 additions & 6 deletions vendor/github.com/cockroachdb/pebble/internal/manifest/version.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading