go: Switch to CometBFT v0.34.27 #5268
Conversation
abukosek
force-pushed
the
andrej/feature/cometbft
branch
from
4231a4d to
821075e
Compare
abukosek
requested review from
kostko,
peterjgilbert,
pro-wh,
ptrus and
peternose
as code owners
Codecov Report
@@ Coverage Diff @@
## master #5268 +/- ##
==========================================
- Coverage 67.09% 66.41% -0.69%
==========================================
Files 516 516
Lines 54814 54825 +11
==========================================
- Hits 36780 36411 -369
- Misses 13574 13912 +338
- Partials 4460 4502 +42
|
| github.com/btcsuite/btcd v0.22.1 // indirect | ||
| github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect |
There was a problem hiding this comment.
Running go mod tidy returns an error.
➜ go git:(821075e18) ✗ go mod tidy
github.com/oasisprotocol/oasis-core/go/consensus/tendermint/abci imports
github.com/tendermint/tendermint/abci/types imports
github.com/tendermint/tendermint/crypto/secp256k1 imports
github.com/btcsuite/btcd/btcec/v2/ecdsa tested by
github.com/btcsuite/btcd/btcec/v2/ecdsa.test imports
github.com/btcsuite/btcd/chaincfg/chainhash: ambiguous import: found package github.com/btcsuite/btcd/chaincfg/chainhash in multiple modules:
github.com/btcsuite/btcd v0.20.1-beta (/home/peter/go/pkg/mod/github.com/btcsuite/[email protected]/chaincfg/chainhash)
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 (/home/peter/go/pkg/mod/github.com/btcsuite/btcd/chaincfg/[email protected])
| @@ -9,10 +9,10 @@ import ( | |||
| "strings" | |||
| "sync" | |||
|
|
|||
| dbm "github.com/cometbft/cometbft-db" | |||
There was a problem hiding this comment.
| dbm "github.com/cometbft/cometbft-db" | |
| cdb "github.com/cometbft/cometbft-db" |
Have no idea where dbm comes from :)
There was a problem hiding this comment.
We use this elsewhere for the Tendermint DB import, so I standardized on it :)
There was a problem hiding this comment.
Your changes make sense, but not sure why was named dbm in the first place. As we switched to cometbft, we could rename to cdb or something similar everywhere.
There was a problem hiding this comment.
What if they rename it again?
dbm is probably "database module" or something similar, I think it fits fine :P
That's strange, we run this as part of CI? |
I have no idea how to fix this, it seems like a problem in an upstream package or |
This will probably fix it: golang/go#60352 |
We should probably fix |
We can do this after Go 1.20.5 is released, which should have a fix for this issue, otherwise all our builds will keep failing... |
This PR switches from our fork of Tendermint to our fork of CometBFT, which is a drop-in replacement.
Here is our fork of CometBFT that contains the exact same patches as our Tendermint fork: https://github.com/oasisprotocol/cometbft/tree/v0.34.27-oasis1