Skip to content

Commit e4cd5ec

Browse files
pfi79pfi79
authored
bump go to 1.26.0 and exec 'go fix' (#665)
Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>
1 parent c3f5b1f commit e4cd5ec

File tree

12 files changed

+108
-111
lines changed

12 files changed

+108
-111
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
GO_VER: 1.25.5
11+
GO_VER: 1.26.0
1212
PROTOC_VER: "33.1"
1313
PROTOC_GEN_GO_VER: v1.36.10
1414

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hyperledger-labs/SmartBFT
22

3-
go 1.25.5
3+
go 1.26.0
44

55
require (
66
github.com/stretchr/testify v1.11.1

‎internal/bft/batcher_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func TestBatcherWhileSubmitting(t *testing.T) {
122122
batcher := bft.NewBatchBuilder(pool, submittedChan, 100, 5000, 100*time.Second)
123123

124124
go func() {
125-
for i := 0; i < 300; i++ {
125+
for i := range 300 {
126126
iStr := fmt.Sprintf("%d", i)
127127
byteReq := makeTestRequest(iStr, iStr, "foo")
128128
err := pool.Submit(byteReq)
@@ -132,7 +132,7 @@ func TestBatcherWhileSubmitting(t *testing.T) {
132132

133133
res := batcher.NextBatch()
134134
assert.Len(t, res, 100)
135-
for i := 0; i < 100; i++ {
135+
for i := range 100 {
136136
iStr := fmt.Sprintf("%d", i)
137137
reqInfo := insp.RequestID(res[i])
138138
assert.Equal(t, iStr, reqInfo.ID)
@@ -142,7 +142,7 @@ func TestBatcherWhileSubmitting(t *testing.T) {
142142

143143
res = batcher.NextBatch()
144144
assert.Len(t, res, 100)
145-
for i := 0; i < 100; i++ {
145+
for i := range 100 {
146146
iStr := fmt.Sprintf("%d", i+100)
147147
reqInfo := insp.RequestID(res[i])
148148
assert.Equal(t, iStr, reqInfo.ID)
@@ -152,7 +152,7 @@ func TestBatcherWhileSubmitting(t *testing.T) {
152152

153153
res = batcher.NextBatch()
154154
assert.Len(t, res, 100)
155-
for i := 0; i < 100; i++ {
155+
for i := range 100 {
156156
iStr := fmt.Sprintf("%d", i+200)
157157
reqInfo := insp.RequestID(res[i])
158158
assert.Equal(t, iStr, reqInfo.ID)

‎internal/bft/requestpool_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func TestReqPoolCapacity(t *testing.T) {
184184

185185
wg := sync.WaitGroup{}
186186
wg.Add(2 * numReq)
187-
for i := 0; i < numReq; i++ {
187+
for i := range numReq {
188188
go func(i string) {
189189
byteReq := makeTestRequest(i, i, "foo")
190190
err := pool.Submit(byteReq)
@@ -198,7 +198,7 @@ func TestReqPoolCapacity(t *testing.T) {
198198

199199
time.Sleep(10 * time.Millisecond)
200200

201-
for i := 0; i < numReq; i++ {
201+
for i := range numReq {
202202
go func(i string) {
203203
req := types.RequestInfo{
204204
ID: i,
@@ -223,7 +223,7 @@ func TestReqPoolCapacity(t *testing.T) {
223223

224224
var lengths []int
225225
var totalLength int
226-
for i := 0; i < 10; i++ {
226+
for i := range 10 {
227227
r := makeTestRequest("1", fmt.Sprintf("%d", i), "aaaaaa")
228228
lengths = append(lengths, len(r))
229229
err := pool.Submit(r)

‎internal/bft/sched.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ func (h backingHeap) Swap(i, j int) {
4444
h[i], h[j] = h[j], h[i]
4545
}
4646

47-
func (h *backingHeap) Push(o interface{}) {
47+
func (h *backingHeap) Push(o any) {
4848
t := o.(*Task)
4949
*h = append(*h, t)
5050
}
5151

52-
func (h *backingHeap) Pop() interface{} {
52+
func (h *backingHeap) Pop() any {
5353
old := *h
5454
n := len(old)
5555
x := old[n-1]

‎internal/bft/viewchanger_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,7 @@ func TestCheckInFlightNoProposal(t *testing.T) {
17311731
verifier := &mocks.VerifierMock{}
17321732
verifier.On("VerifyConsenterSig", mock.Anything, mock.Anything).Return(nil, nil)
17331733
messages := make([]*protos.ViewData, 0)
1734-
for i := 0; i < 4; i++ {
1734+
for range 4 {
17351735
messages = append(messages, proto.Clone(vd).(*protos.ViewData))
17361736
}
17371737
test.mutateMessages(messages)
@@ -1891,7 +1891,7 @@ func TestCheckInFlightWithProposal(t *testing.T) {
18911891
verifier := &mocks.VerifierMock{}
18921892
verifier.On("VerifyConsenterSig", mock.Anything, mock.Anything).Return(nil, nil)
18931893
messages := make([]*protos.ViewData, 0)
1894-
for i := 0; i < 4; i++ {
1894+
for range 4 {
18951895
messages = append(messages, proto.Clone(vd).(*protos.ViewData))
18961896
}
18971897
test.mutateMessages(messages)

‎pkg/api/dependencies.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ type Synchronizer interface {
9191

9292
// Logger defines the contract for logging.
9393
type Logger interface {
94-
Debugf(template string, args ...interface{})
95-
Infof(template string, args ...interface{})
96-
Errorf(template string, args ...interface{})
97-
Warnf(template string, args ...interface{})
98-
Panicf(template string, args ...interface{})
94+
Debugf(template string, args ...any)
95+
Infof(template string, args ...any)
96+
Errorf(template string, args ...any)
97+
Warnf(template string, args ...any)
98+
Panicf(template string, args ...any)
9999
}

‎pkg/consensus/consensus.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,8 @@ func (c *Consensus) reconfig(reconfig types.Reconfig) {
194194
c.collector.Stop()
195195

196196
var exist bool
197-
for _, n := range reconfig.CurrentNodes {
198-
if c.Config.SelfID == n {
199-
exist = true
200-
break
201-
}
197+
if slices.Contains(reconfig.CurrentNodes, c.Config.SelfID) {
198+
exist = true
202199
}
203200

204201
if !exist {

‎pkg/wal/util_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ func make8LogFiles(t *testing.T, logger api.Logger, testDir string) {
282282
Data: make([]byte, 512),
283283
}
284284

285-
for i := 0; i < 30; i++ {
285+
for range 30 {
286286
err = wal.Append(rec1.Data, rec1.TruncateTo)
287287
assert.NoError(t, err)
288288
}

‎pkg/wal/writeaheadlog_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ func TestWriteAheadLogFile_Open(t *testing.T) {
115115

116116
const NumBytes = 1024
117117
const NumRec = 20
118-
for m := 0; m < NumRec; m++ {
118+
for m := range NumRec {
119119
data1 := make([]byte, NumBytes)
120-
for n := 0; n < NumBytes; n++ {
120+
for n := range NumBytes {
121121
data1[n] = byte(n % (m + 1))
122122
}
123123
err = wal.Append(data1, false)
@@ -288,9 +288,9 @@ func TestWriteAheadLogFile_Append(t *testing.T) {
288288
const NumRec = 20
289289
records := make([]*smartbftprotos.LogRecord, NumRec)
290290
var crc1, crc2 uint32
291-
for m := 0; m < NumRec; m++ {
291+
for m := range NumRec {
292292
data1 := make([]byte, NumBytes)
293-
for n := 0; n < NumBytes; n++ {
293+
for n := range NumBytes {
294294
data1[n] = byte(n % (m + 1))
295295
}
296296

@@ -337,9 +337,9 @@ func TestWriteAheadLogFile_Append(t *testing.T) {
337337
const NumRec = 41
338338
records := make([]*smartbftprotos.LogRecord, NumRec)
339339
var crc1, crc2 uint32
340-
for m := 0; m < NumRec; m++ {
340+
for m := range NumRec {
341341
data1 := make([]byte, NumBytes)
342-
for n := 0; n < NumBytes; n++ {
342+
for n := range NumBytes {
343343
data1[n] = byte(n % (m + 1))
344344
}
345345

@@ -509,8 +509,8 @@ func TestWriteAheadLogFile_ReadAll(t *testing.T) {
509509
const NumBytes = 1024
510510
const NumRec = 100
511511
data1 := make([]byte, NumBytes)
512-
for m := 0; m < NumRec; m++ {
513-
for n := 0; n < NumBytes; n++ {
512+
for m := range NumRec {
513+
for n := range NumBytes {
514514
data1[n] = byte(m)
515515
}
516516
err = wal.Append(data1, false)
@@ -542,8 +542,8 @@ func TestWriteAheadLogFile_ReadAll(t *testing.T) {
542542
// continue to write
543543
logger.Infof(">>> Continue to write")
544544

545-
for m := 0; m < NumRec; m++ {
546-
for n := 0; n < NumBytes; n++ {
545+
for m := range NumRec {
546+
for n := range NumBytes {
547547
data1[n] = byte(m)
548548
}
549549

@@ -608,8 +608,8 @@ func TestWriteAheadLogFile_Repair(t *testing.T) {
608608
const NumBytes = 1024
609609
const NumRec = 102
610610
data1 := make([]byte, NumBytes)
611-
for m := 0; m < NumRec; m++ {
612-
for n := 0; n < NumBytes; n++ {
611+
for m := range NumRec {
612+
for n := range NumBytes {
613613
data1[n] = byte(m)
614614
}
615615
err = wal.Append(data1, false)
@@ -650,8 +650,8 @@ func TestWriteAheadLogFile_Repair(t *testing.T) {
650650
const NumBytes = 1024
651651
const NumRec = 102
652652
data1 := make([]byte, NumBytes)
653-
for m := 0; m < NumRec; m++ {
654-
for n := 0; n < NumBytes; n++ {
653+
for m := range NumRec {
654+
for n := range NumBytes {
655655
data1[n] = byte(m)
656656
}
657657
err = wal.Append(data1, false)
@@ -714,9 +714,9 @@ func TestWriteAheadLogFile_InitializeAndReadAll(t *testing.T) {
714714
NumRec = 20
715715
)
716716

717-
for m := 0; m < NumRec; m++ {
717+
for m := range NumRec {
718718
data1 := make([]byte, NumBytes)
719-
for n := 0; n < NumBytes; n++ {
719+
for n := range NumBytes {
720720
data1[n] = byte(n % (m + 1))
721721
}
722722

0 commit comments

Comments
 (0)
⚡