Skip to content

Commit b6bf805

Browse files
committed
fix: ci
1 parent 6a499fa commit b6bf805

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

common/types/db.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ type BlobStoragePlatform int
360360
const (
361361
// BlobStoragePlatformUndefined indicates an undefined platform
362362
BlobStoragePlatformUndefined BlobStoragePlatform = iota
363-
// BlobStoragePlatformS3 represents AWS S3
363+
// BlobStoragePlatformS3 represents AWS S3
364364
BlobStoragePlatformS3
365-
// BlobUploadStatusUploaded represents storage blockchain Arweave
365+
// BlobStoragePlatformArweave represents storage blockchain Arweave
366366
BlobStoragePlatformArweave
367367
)
368368

@@ -375,4 +375,4 @@ func (s BlobStoragePlatform) String() string {
375375
default:
376376
return fmt.Sprintf("Unknown BlobStoragePlatform (%d)", int32(s))
377377
}
378-
}
378+
}

coordinator/internal/types/prover.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package types
22

33
import (
44
"fmt"
5+
56
"scroll-tech/common/types/message"
67
)
78

rollup/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ go 1.22
44

55
require (
66
github.com/agiledragon/gomonkey/v2 v2.12.0
7+
github.com/aws/aws-sdk-go-v2 v1.36.3
8+
github.com/aws/aws-sdk-go-v2/config v1.29.14
9+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0
711
github.com/consensys/gnark-crypto v0.16.0
812
github.com/crate-crypto/go-kzg-4844 v1.1.0
913
github.com/gin-gonic/gin v1.9.1
@@ -22,10 +26,7 @@ require (
2226

2327
require (
2428
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
25-
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
2629
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
27-
github.com/aws/aws-sdk-go-v2/config v1.29.14 // indirect
28-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
2930
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
3031
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
3132
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
@@ -35,7 +36,6 @@ require (
3536
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2 // indirect
3637
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
3738
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0 // indirect
3939
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
4040
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
4141
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect

rollup/internal/controller/blob_uploader/blob_uploader_metrics.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ import (
88
)
99

1010
type blobUploaderMetrics struct {
11-
rollupBlobUploaderUploadToS3Total prometheus.Counter
11+
rollupBlobUploaderUploadToS3Total prometheus.Counter
1212
}
1313

1414
var (
1515
initBlobUploaderMetricsOnce sync.Once
16-
l1RelayerMetric *blobUploaderMetrics
16+
blobUploaderMetric *blobUploaderMetrics
1717
)
1818

1919
func initblobUploaderMetrics(reg prometheus.Registerer) *blobUploaderMetrics {
2020
initBlobUploaderMetricsOnce.Do(func() {
21-
l1RelayerMetric = &blobUploaderMetrics{
21+
blobUploaderMetric = &blobUploaderMetrics{
2222
rollupBlobUploaderUploadToS3Total: promauto.With(reg).NewCounter(prometheus.CounterOpts{
2323
Name: "rollup_blob_uploader_upload_to_s3_total",
2424
Help: "The total number of upload blob to S3 run total",
2525
}),
2626
}
2727
})
28-
return l1RelayerMetric
28+
return blobUploaderMetric
2929
}

rollup/internal/controller/watcher/proposer_tool.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ import (
1414
"github.com/scroll-tech/go-ethereum/params"
1515
"gorm.io/gorm"
1616

17+
"scroll-tech/database/migrate"
18+
1719
"scroll-tech/common/database"
1820
"scroll-tech/common/utils"
19-
"scroll-tech/database/migrate"
2021

2122
"scroll-tech/rollup/internal/config"
2223
"scroll-tech/rollup/internal/orm"

rollup/internal/orm/blob_upload.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func (o *BlobUpload) GetPendingBlobUploadsByPlatform(ctx context.Context, platfo
126126

127127
// GetFailedBlobUploadsByPlatform retrieves all failed blob upload records by platform.
128128
func (o *BlobUpload) GetFailedBlobUploadsByPlatform(ctx context.Context, platform types.BlobStoragePlatform) ([]*BlobUpload, error) {
129-
129+
130130
db := o.db.WithContext(ctx)
131131
db = db.Model(&BlobUpload{})
132132
db = db.Where("status = ? AND platform = ?", types.BlobUploadStatusFailed, platform)

0 commit comments

Comments
 (0)