feat(log): remove core dependency and update core interface to be dependency free (backport #21045) (#21089)
Co-authored-by: Aaron Craelius <aaronc@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
co-authored by
Aaron Craelius
Julien Robert
parent
6bd057bd09
commit
fcb808a54c
@@ -11,8 +11,8 @@ import (
|
||||
|
||||
_ "cosmossdk.io/api/cosmos/counter/v1"
|
||||
_ "cosmossdk.io/api/cosmos/crypto/secp256k1"
|
||||
coretesting "cosmossdk.io/core/testing"
|
||||
"cosmossdk.io/core/transaction"
|
||||
"cosmossdk.io/log"
|
||||
"cosmossdk.io/x/auth/signing"
|
||||
|
||||
codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
|
||||
@@ -174,7 +174,7 @@ func fetchTxs(iterator mempool.Iterator, maxBytes int64) []sdk.Tx {
|
||||
|
||||
func (s *MempoolTestSuite) TestDefaultMempool() {
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 10)
|
||||
txCount := 1000
|
||||
var txs []testTx
|
||||
@@ -266,7 +266,7 @@ func TestMempoolTestSuite(t *testing.T) {
|
||||
}
|
||||
|
||||
func (s *MempoolTestSuite) TestSampleTxs() {
|
||||
ctxt := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctxt := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
t := s.T()
|
||||
s.resetMempool()
|
||||
mp := s.mempool
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
coretesting "cosmossdk.io/core/testing"
|
||||
"cosmossdk.io/log"
|
||||
"cosmossdk.io/x/auth/signing"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
@@ -83,7 +83,7 @@ func (a signerExtractionAdapter) GetSigners(tx sdk.Tx) ([]mempool.SignerData, er
|
||||
|
||||
func (s *MempoolTestSuite) TestPriorityNonceTxOrderWithAdapter() {
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 5)
|
||||
sa := accounts[0].Address
|
||||
sb := accounts[1].Address
|
||||
@@ -142,7 +142,7 @@ func (s *MempoolTestSuite) TestPriorityNonceTxOrderWithAdapter() {
|
||||
|
||||
func (s *MempoolTestSuite) TestPriorityNonceTxOrder() {
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 5)
|
||||
sa := accounts[0].Address
|
||||
sb := accounts[1].Address
|
||||
@@ -341,7 +341,7 @@ func (s *MempoolTestSuite) TestPriorityNonceTxOrder() {
|
||||
|
||||
func (s *MempoolTestSuite) TestIterator() {
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 2)
|
||||
sa := accounts[0].Address
|
||||
sb := accounts[1].Address
|
||||
@@ -396,7 +396,7 @@ func (s *MempoolTestSuite) TestIterator() {
|
||||
}
|
||||
|
||||
func (s *MempoolTestSuite) TestPriorityTies() {
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 3)
|
||||
sa := accounts[0].Address
|
||||
sb := accounts[1].Address
|
||||
@@ -520,7 +520,7 @@ func (s *MempoolTestSuite) TestRandomGeneratedTxs() {
|
||||
)
|
||||
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
seed := time.Now().UnixNano()
|
||||
|
||||
t.Logf("running with seed: %d", seed)
|
||||
@@ -556,7 +556,7 @@ func (s *MempoolTestSuite) TestRandomWalkTxs() {
|
||||
s.mempool = mempool.DefaultPriorityMempool()
|
||||
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
|
||||
seed := time.Now().UnixNano()
|
||||
// interesting failing seeds:
|
||||
@@ -729,7 +729,7 @@ func TestTxOrderN(t *testing.T) {
|
||||
|
||||
func TestPriorityNonceMempool_NextSenderTx(t *testing.T) {
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 2)
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accA := accounts[0].Address
|
||||
accB := accounts[1].Address
|
||||
|
||||
@@ -759,7 +759,7 @@ func TestPriorityNonceMempool_NextSenderTx(t *testing.T) {
|
||||
|
||||
func TestNextSenderTx_TxLimit(t *testing.T) {
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 2)
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
sa := accounts[0].Address
|
||||
sb := accounts[1].Address
|
||||
|
||||
@@ -835,7 +835,7 @@ func TestNextSenderTx_TxLimit(t *testing.T) {
|
||||
|
||||
func TestNextSenderTx_TxReplacement(t *testing.T) {
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
sa := accounts[0].Address
|
||||
|
||||
txs := []testTx{
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
"pgregory.net/rapid"
|
||||
|
||||
coretesting "cosmossdk.io/core/testing"
|
||||
"cosmossdk.io/log"
|
||||
"cosmossdk.io/x/auth/signing"
|
||||
|
||||
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
|
||||
@@ -33,7 +33,7 @@ func AddressGenerator(t *rapid.T) *rapid.Generator[sdk.AccAddress] {
|
||||
}
|
||||
|
||||
func testMempoolProperties(t *rapid.T) {
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
mp := mempool.NewSenderNonceMempool()
|
||||
|
||||
genMultipleAddress := rapid.SliceOfNDistinct(AddressGenerator(t), 1, 10, func(acc sdk.AccAddress) string {
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
coretesting "cosmossdk.io/core/testing"
|
||||
"cosmossdk.io/log"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/types/mempool"
|
||||
@@ -16,7 +16,7 @@ import (
|
||||
|
||||
func (s *MempoolTestSuite) TestTxOrder() {
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 5)
|
||||
sa := accounts[0].Address
|
||||
sb := accounts[1].Address
|
||||
@@ -140,7 +140,7 @@ func (s *MempoolTestSuite) TestTxOrder() {
|
||||
|
||||
func (s *MempoolTestSuite) TestMaxTx() {
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
|
||||
mp := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(1))
|
||||
|
||||
@@ -170,7 +170,7 @@ func (s *MempoolTestSuite) TestMaxTx() {
|
||||
|
||||
func (s *MempoolTestSuite) TestTxNotFoundOnSender() {
|
||||
t := s.T()
|
||||
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
|
||||
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
|
||||
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
|
||||
mp := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user