Skip to content

Commit

Permalink
Update SmartBFT library to latest version
Browse files Browse the repository at this point in the history
Signed-off-by: Yacov Manevich <yacov.manevich@ibm.com>
  • Loading branch information
yacovm authored and C0rWin committed May 1, 2023
1 parent d2007e7 commit 0f2c2af
Show file tree
Hide file tree
Showing 25 changed files with 1,353 additions and 476 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
code.cloudfoundry.org/clock v1.0.0
github.com/IBM/idemix v0.0.0-20220112103229-701e7610d405
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
github.com/SmartBFT-Go/consensus v0.0.0-20230212211744-e5a79afcea81
github.com/SmartBFT-Go/consensus v0.0.0-20230430133422-4dca5ba006ee
github.com/VictoriaMetrics/fastcache v1.9.0
github.com/bits-and-blooms/bitset v1.2.1
github.com/cheggaaa/pb v1.0.29
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ github.com/Microsoft/hcsshim v0.8.25/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
github.com/SmartBFT-Go/consensus v0.0.0-20230212211744-e5a79afcea81 h1:yiyJRAf/rsEu3Sl0ATWu1zREfyaj01i9VsPbGiXzZZw=
github.com/SmartBFT-Go/consensus v0.0.0-20230212211744-e5a79afcea81/go.mod h1:ZOD/ZiAdH9HpqdsJLlUTlbzYBr/qYEzyYx7wClbrH+w=
github.com/SmartBFT-Go/consensus v0.0.0-20230430133422-4dca5ba006ee h1:1/b3uHIk7nZRRJK5bkPBs/8URxSkD7xgsMZpwK3yk1A=
github.com/SmartBFT-Go/consensus v0.0.0-20230430133422-4dca5ba006ee/go.mod h1:KsqqnNjG+MiuEdm/9ufh5C0oKJqd1rkpQ5S2mYPvVcA=
github.com/VictoriaMetrics/fastcache v1.9.0 h1:oMwsS6c8abz98B7ytAewQ7M1ZN/Im/iwKoE1euaFvhs=
github.com/VictoriaMetrics/fastcache v1.9.0/go.mod h1:otoTS3xu+6IzF/qByjqzjp3rTuzM3Qf0ScU1UTj97iU=
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
Expand Down
5 changes: 4 additions & 1 deletion orderer/consensus/smartbft/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ import (
"sync/atomic"
"time"

"github.com/SmartBFT-Go/consensus/pkg/api"
smartbft "github.com/SmartBFT-Go/consensus/pkg/consensus"
"github.com/SmartBFT-Go/consensus/pkg/metrics/disabled"
"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/pkg/wal"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
Expand Down Expand Up @@ -231,7 +233,8 @@ func bftSmartConsensusBuild(
return c.RuntimeConfig.Load().(RuntimeConfig).LastConfigBlock.Header.Number
},
},
Metadata: smartbftprotos.ViewMetadata{
MetricsProvider: api.NewCustomerProvider(&disabled.Provider{}),
Metadata: &smartbftprotos.ViewMetadata{
ViewId: latestMetadata.ViewId,
LatestSequence: latestMetadata.LatestSequence,
DecisionsInView: latestMetadata.DecisionsInView,
Expand Down

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

24 changes: 15 additions & 9 deletions vendor/github.com/SmartBFT-Go/consensus/internal/bft/controller.go

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

Loading

0 comments on commit 0f2c2af

Please sign in to comment.