Skip to content

Commit 934dfe2

Browse files
pfi79denyeart
authored andcommitted
bump go 1.24.0
Signed-off-by: Fedor Partanskiy <[email protected]>
1 parent 31af637 commit 934dfe2

File tree

26 files changed

+61
-65
lines changed

26 files changed

+61
-65
lines changed

.github/workflows/broken-link-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- .github/workflows/broken-link-checker.yml
1414

1515
env:
16-
GO_VER: 1.23.6
16+
GO_VER: 1.24.0
1717

1818
permissions:
1919
contents: read

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- v3.*
1313

1414
env:
15-
GO_VER: 1.23.6
15+
GO_VER: 1.24.0
1616
UBUNTU_VER: 22.04
1717
FABRIC_VER: ${{ github.ref_name }}
1818

.github/workflows/verify-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
env:
1414
GOPATH: /opt/go
1515
PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
16-
GO_VER: 1.23.6
16+
GO_VER: 1.24.0
1717

1818
permissions:
1919
contents: read # to fetch code (actions/checkout)

.github/workflows/vulnerability-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ jobs:
3030
- name: Set up Go
3131
uses: actions/setup-go@v5
3232
with:
33-
go-version: 1.23.6
33+
go-version: 1.24.0
3434
- name: Scan
3535
run: make scan

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ METADATA_VAR += CommitSHA=$(EXTRA_VERSION)
7777
METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
7878
METADATA_VAR += DockerNamespace=$(DOCKER_NS)
7979

80-
GO_VER = 1.23.6
80+
GO_VER = 1.24.0
8181
GO_TAGS ?=
8282

8383
RELEASE_EXES = orderer $(TOOLS_EXES)

common/policies/implicitmeta.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (imp *ImplicitMetaPolicy) EvaluateSignedData(signatureSet []*protoutil.Sign
8383
b.WriteString(" ")
8484
}
8585
b.WriteString("]")
86-
logger.Debugf(b.String())
86+
logger.Debug(b.String())
8787
}
8888
}
8989
}()
@@ -126,7 +126,7 @@ func (imp *ImplicitMetaPolicy) EvaluateIdentities(identities []msp.Identity) err
126126
b.WriteString(" ")
127127
}
128128
b.WriteString("]")
129-
logger.Debugf(b.String())
129+
logger.Debug(b.String())
130130
}()
131131

132132
for _, policy := range imp.SubPolicies {

core/committer/txvalidator/v14/vscc_validator.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,7 @@ func (v *VsccValidatorImpl) GetInfoForValidate(chdr *common.ChannelHeader, ccID
345345
// obtain name of the VSCC and the policy
346346
cd, err := v.getCDataForCC(chdr.ChannelId, ccID)
347347
if err != nil {
348-
msg := fmt.Sprintf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err)
349-
logger.Errorf(msg)
348+
logger.Errorf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err)
350349
return nil, nil, nil, err
351350
}
352351
cc.ChaincodeName = cd.Name

core/committer/txvalidator/v20/plugindispatcher/dispatcher.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,7 @@ func (v *dispatcherImpl) GetInfoForValidate(chdr *common.ChannelHeader, ccID str
267267
// obtain name of the validation plugin and the policy
268268
plugin, args, err := v.getCDataForCC(chdr.ChannelId, ccID)
269269
if err != nil {
270-
msg := fmt.Sprintf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err)
271-
logger.Errorf(msg)
270+
logger.Errorf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err)
272271
return "", nil, err
273272
}
274273
return plugin, args, nil

core/common/validation/statebased/validator_keylevel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (p *baseEvaluator) checkSBAndCCEP(cc, coll, key string, blockNum, txNum uin
5252
// logged and ignored. The ledger will take the most appropriate action
5353
// when performing its side of the validation.
5454
case *ledger.CollConfigNotDefinedError, *ledger.InvalidCollNameError:
55-
logger.Warningf(errors.WithMessage(err, "skipping key-level validation").Error())
55+
logger.Warning(errors.WithMessage(err, "skipping key-level validation").Error())
5656
// 3) any other type of error should return an execution failure which will
5757
// lead to halting the processing on this channel. Note that any non-categorized
5858
// deterministic error would be caught by the default and would lead to

core/common/validation/statebased/vpmanagerimpl.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc
306306
// bail, if the validation parameter has been updated in the meantime
307307
err := vCtx.waitForValidationResults(newLedgerKeyID(cc, coll, key), blockNum, txNum)
308308
if err != nil {
309-
logger.Errorf(err.Error())
309+
logger.Error(err.Error())
310310
return nil, err
311311
}
312312

@@ -316,7 +316,7 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc
316316
state, err := m.StateFetcher.FetchState()
317317
if err != nil {
318318
err = errors.WithMessage(err, "could not retrieve ledger")
319-
logger.Errorf(err.Error())
319+
logger.Error(err.Error())
320320
return nil, err
321321
}
322322
defer state.Done()
@@ -326,14 +326,14 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc
326326
mdMap, err = state.GetStateMetadata(cc, key)
327327
if err != nil {
328328
err = errors.WithMessagef(err, "could not retrieve metadata for %s:%s", cc, key)
329-
logger.Errorf(err.Error())
329+
logger.Error(err.Error())
330330
return nil, err
331331
}
332332
} else {
333333
mdMap, err = state.GetPrivateDataMetadataByHash(cc, coll, []byte(key))
334334
if err != nil {
335335
err = errors.WithMessagef(err, "could not retrieve metadata for %s:%s:%x", cc, coll, []byte(key))
336-
logger.Errorf(err.Error())
336+
logger.Error(err.Error())
337337
return nil, err
338338
}
339339
}

0 commit comments

Comments
 (0)