forked from cerc-io/laconicd-deprecated
fix test compilation
This commit is contained in:
parent
4d849a6241
commit
374d249116
@ -9,9 +9,9 @@ import (
|
||||
|
||||
ethcmn "github.com/ethereum/go-ethereum/common"
|
||||
|
||||
tmcrypto "github.com/tendermint/tendermint/crypto"
|
||||
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
|
||||
|
||||
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
|
||||
"github.com/cosmos/ethermint/app"
|
||||
@ -83,7 +83,7 @@ func (suite *AnteTestSuite) TestValidTx() {
|
||||
msg1 := newTestMsg(addr1, addr2)
|
||||
msgs := []sdk.Msg{msg1}
|
||||
|
||||
privKeys := []tmcrypto.PrivKey{priv1, priv2}
|
||||
privKeys := []cryptotypes.PrivKey{priv1, priv2}
|
||||
accNums := []uint64{acc1.GetAccountNumber(), acc2.GetAccountNumber()}
|
||||
accSeqs := []uint64{acc1.GetSequence(), acc2.GetSequence()}
|
||||
|
||||
@ -115,7 +115,7 @@ func (suite *AnteTestSuite) TestSDKInvalidSigs() {
|
||||
// require validation failure with no signers
|
||||
msgs := []sdk.Msg{msg1}
|
||||
|
||||
privKeys := []tmcrypto.PrivKey{}
|
||||
privKeys := []cryptotypes.PrivKey{}
|
||||
accNums := []uint64{acc1.GetAccountNumber(), acc2.GetAccountNumber()}
|
||||
accSeqs := []uint64{acc1.GetSequence(), acc2.GetSequence()}
|
||||
|
||||
@ -125,7 +125,7 @@ func (suite *AnteTestSuite) TestSDKInvalidSigs() {
|
||||
// require validation failure with invalid number of signers
|
||||
msgs = []sdk.Msg{msg1}
|
||||
|
||||
privKeys = []tmcrypto.PrivKey{priv1}
|
||||
privKeys = []cryptotypes.PrivKey{priv1}
|
||||
accNums = []uint64{acc1.GetAccountNumber(), acc2.GetAccountNumber()}
|
||||
accSeqs = []uint64{acc1.GetSequence(), acc2.GetSequence()}
|
||||
|
||||
@ -136,7 +136,7 @@ func (suite *AnteTestSuite) TestSDKInvalidSigs() {
|
||||
msg2 := newTestMsg(addr1, addr3)
|
||||
msgs = []sdk.Msg{msg1, msg2}
|
||||
|
||||
privKeys = []tmcrypto.PrivKey{priv1, priv2, priv3}
|
||||
privKeys = []cryptotypes.PrivKey{priv1, priv2, priv3}
|
||||
accNums = []uint64{acc1.GetAccountNumber(), acc2.GetAccountNumber(), 0}
|
||||
accSeqs = []uint64{acc1.GetSequence(), acc2.GetSequence(), 0}
|
||||
|
||||
@ -157,7 +157,7 @@ func (suite *AnteTestSuite) TestSDKInvalidAcc() {
|
||||
fee := newTestStdFee()
|
||||
msg1 := newTestMsg(addr1)
|
||||
msgs := []sdk.Msg{msg1}
|
||||
privKeys := []tmcrypto.PrivKey{priv1}
|
||||
privKeys := []cryptotypes.PrivKey{priv1}
|
||||
|
||||
// require validation failure with invalid account number
|
||||
accNums := []uint64{1}
|
||||
|
@ -6,11 +6,11 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/suite"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
|
||||
"github.com/cosmos/cosmos-sdk/simapp/params"
|
||||
"github.com/cosmos/cosmos-sdk/testutil/testdata"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
|
||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
|
||||
"github.com/cosmos/ethermint/app"
|
||||
@ -21,7 +21,6 @@ import (
|
||||
|
||||
ethcrypto "github.com/ethereum/go-ethereum/crypto"
|
||||
|
||||
tmcrypto "github.com/tendermint/tendermint/crypto"
|
||||
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
|
||||
)
|
||||
|
||||
@ -43,7 +42,7 @@ func (suite *AnteTestSuite) SetupTest() {
|
||||
suite.app.AccountKeeper.SetParams(suite.ctx, authtypes.DefaultParams())
|
||||
suite.app.EvmKeeper.SetParams(suite.ctx, evmtypes.DefaultParams())
|
||||
|
||||
suite.encodingConfig = simapp.MakeEncodingConfig()
|
||||
suite.encodingConfig = app.MakeEncodingConfig()
|
||||
// We're using TestMsg amino encoding in some tests, so register it here.
|
||||
suite.encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
|
||||
|
||||
@ -54,20 +53,20 @@ func TestAnteTestSuite(t *testing.T) {
|
||||
suite.Run(t, new(AnteTestSuite))
|
||||
}
|
||||
|
||||
func newTestMsg(addrs ...sdk.AccAddress) *sdk.TestMsg {
|
||||
return sdk.NewTestMsg(addrs...)
|
||||
func newTestMsg(addrs ...sdk.AccAddress) *testdata.TestMsg {
|
||||
return testdata.NewTestMsg(addrs...)
|
||||
}
|
||||
|
||||
func newTestCoins() sdk.Coins {
|
||||
return sdk.NewCoins(ethermint.NewPhotonCoinInt64(500000000))
|
||||
}
|
||||
|
||||
func newTestStdFee() auth.StdFee {
|
||||
return auth.NewStdFee(220000, sdk.NewCoins(ethermint.NewPhotonCoinInt64(150)))
|
||||
func newTestStdFee() legacytx.StdFee {
|
||||
return legacytx.NewStdFee(220000, sdk.NewCoins(ethermint.NewPhotonCoinInt64(150)))
|
||||
}
|
||||
|
||||
// GenerateAddress generates an Ethereum address.
|
||||
func newTestAddrKey() (sdk.AccAddress, tmcrypto.PrivKey) {
|
||||
func newTestAddrKey() (sdk.AccAddress, cryptotypes.PrivKey) {
|
||||
privkey, _ := ethsecp256k1.GenerateKey()
|
||||
addr := ethcrypto.PubkeyToAddress(privkey.ToECDSA().PublicKey)
|
||||
|
||||
@ -75,29 +74,29 @@ func newTestAddrKey() (sdk.AccAddress, tmcrypto.PrivKey) {
|
||||
}
|
||||
|
||||
func newTestSDKTx(
|
||||
ctx sdk.Context, msgs []sdk.Msg, privs []tmcrypto.PrivKey,
|
||||
accNums []uint64, seqs []uint64, fee auth.StdFee,
|
||||
ctx sdk.Context, msgs []sdk.Msg, privs []cryptotypes.PrivKey,
|
||||
accNums []uint64, seqs []uint64, fee legacytx.StdFee,
|
||||
) sdk.Tx {
|
||||
|
||||
sigs := make([]auth.StdSignature, len(privs))
|
||||
sigs := make([]legacytx.StdSignature, len(privs))
|
||||
for i, priv := range privs {
|
||||
signBytes := auth.StdSignBytes(ctx.ChainID(), accNums[i], seqs[i], fee, msgs, "")
|
||||
signBytes := legacytx.StdSignBytes(ctx.ChainID(), accNums[i], seqs[i], 0, fee, msgs, "")
|
||||
|
||||
sig, err := priv.Sign(signBytes)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
sigs[i] = auth.StdSignature{
|
||||
sigs[i] = legacytx.StdSignature{
|
||||
PubKey: priv.PubKey(),
|
||||
Signature: sig,
|
||||
}
|
||||
}
|
||||
|
||||
return auth.NewStdTx(msgs, fee, sigs, "")
|
||||
return legacytx.NewStdTx(msgs, fee, sigs, "")
|
||||
}
|
||||
|
||||
func newTestEthTx(ctx sdk.Context, msg *evmtypes.MsgEthereumTx, priv tmcrypto.PrivKey) (sdk.Tx, error) {
|
||||
func newTestEthTx(ctx sdk.Context, msg *evmtypes.MsgEthereumTx, priv cryptotypes.PrivKey) (sdk.Tx, error) {
|
||||
chainIDEpoch, err := ethermint.ParseChainID(ctx.ChainID())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
@ -6,55 +6,40 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
coretypes "github.com/tendermint/tendermint/rpc/core/types"
|
||||
)
|
||||
|
||||
func TestAddTopic(t *testing.T) {
|
||||
assert := assert.New(t)
|
||||
|
||||
q := NewEventBus()
|
||||
err := q.AddTopic("kek", make(chan interface{}))
|
||||
if !assert.NoError(err) {
|
||||
return
|
||||
}
|
||||
err := q.AddTopic("kek", make(<-chan coretypes.ResultEvent))
|
||||
require.NoError(t, err)
|
||||
|
||||
err = q.AddTopic("lol", make(chan interface{}))
|
||||
if !assert.NoError(err) {
|
||||
return
|
||||
}
|
||||
err = q.AddTopic("lol", make(<-chan coretypes.ResultEvent))
|
||||
require.NoError(t, err)
|
||||
|
||||
err = q.AddTopic("lol", make(chan interface{}))
|
||||
if !assert.Error(err) {
|
||||
return
|
||||
}
|
||||
err = q.AddTopic("lol", make(<-chan coretypes.ResultEvent))
|
||||
require.Error(t, err)
|
||||
|
||||
assert.EqualValues([]string{"kek", "lol"}, q.Topics())
|
||||
require.EqualValues(t, []string{"kek", "lol"}, q.Topics())
|
||||
}
|
||||
|
||||
func TestSubscribe(t *testing.T) {
|
||||
assert := assert.New(t)
|
||||
|
||||
q := NewEventBus()
|
||||
kekSrc := make(chan interface{})
|
||||
kekSrc := make(<-chan coretypes.ResultEvent)
|
||||
q.AddTopic("kek", kekSrc)
|
||||
|
||||
lolSrc := make(chan interface{})
|
||||
lolSrc := make(<-chan coretypes.ResultEvent)
|
||||
q.AddTopic("lol", lolSrc)
|
||||
|
||||
kekSubC, err := q.Subscribe("kek")
|
||||
if !assert.NoError(err) {
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
|
||||
lolSubC, err := q.Subscribe("lol")
|
||||
if !assert.NoError(err) {
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
|
||||
lol2SubC, err := q.Subscribe("lol")
|
||||
if !assert.NoError(err) {
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
|
||||
wg := new(sync.WaitGroup)
|
||||
wg.Add(4)
|
||||
@ -63,32 +48,29 @@ func TestSubscribe(t *testing.T) {
|
||||
defer wg.Done()
|
||||
msg := <-kekSubC
|
||||
log.Println("kek:", msg)
|
||||
assert.EqualValues(1, msg)
|
||||
require.EqualValues(t, 1, msg)
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
msg := <-lolSubC
|
||||
log.Println("lol:", msg)
|
||||
assert.EqualValues(1, msg)
|
||||
require.EqualValues(t, 1, msg)
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
msg := <-lol2SubC
|
||||
log.Println("lol2:", msg)
|
||||
assert.EqualValues(1, msg)
|
||||
require.EqualValues(t, 1, msg)
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
|
||||
time.Sleep(time.Second)
|
||||
kekSrc <- 1
|
||||
lolSrc <- 1
|
||||
|
||||
close(kekSrc)
|
||||
close(lolSrc)
|
||||
<-kekSrc
|
||||
<-lolSrc
|
||||
}()
|
||||
|
||||
wg.Wait()
|
||||
|
@ -264,8 +264,8 @@ func TestImportBlocks(t *testing.T) {
|
||||
}
|
||||
|
||||
for i, tx := range block.Transactions() {
|
||||
evmKeeper.Prepare(ctx, tx.Hash(), i)
|
||||
evmKeeper.CommitStateDB.SetBlockHash(block.Hash())
|
||||
evmKeeper.Prepare(ctx, tx.Hash(), block.Hash(), i)
|
||||
// evmKeeper.CommitStateDB.Set(block.Hash())
|
||||
|
||||
receipt, gas, err := applyTransaction(
|
||||
chainConfig, chainContext, nil, gp, evmKeeper, header, tx, usedGas, vmConfig,
|
||||
|
@ -33,7 +33,7 @@ type EvmTestSuite struct {
|
||||
|
||||
ctx sdk.Context
|
||||
handler sdk.Handler
|
||||
app *app.InjectiveApp
|
||||
app *app.EthermintApp
|
||||
codec codec.BinaryMarshaler
|
||||
|
||||
privKey *ethsecp256k1.PrivKey
|
||||
@ -45,7 +45,7 @@ func (suite *EvmTestSuite) SetupTest() {
|
||||
checkTx := false
|
||||
|
||||
suite.app = app.Setup(checkTx)
|
||||
suite.ctx = suite.app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1, ChainID: "888", Time: time.Now().UTC()})
|
||||
suite.ctx = suite.app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1, ChainID: "ethermint-888", Time: time.Now().UTC()})
|
||||
suite.handler = evm.NewHandler(suite.app.EvmKeeper)
|
||||
suite.codec = suite.app.AppCodec()
|
||||
|
||||
|
@ -33,7 +33,7 @@ type KeeperTestSuite struct {
|
||||
|
||||
ctx sdk.Context
|
||||
querier sdk.Querier
|
||||
app *app.InjectiveApp
|
||||
app *app.EthermintApp
|
||||
address ethcmn.Address
|
||||
}
|
||||
|
||||
|
@ -126,7 +126,7 @@ func (suite *StateDBTestSuite) TestTransitionDb() {
|
||||
"nil gas price",
|
||||
func() {
|
||||
invalidGas := sdk.DecCoins{
|
||||
{Denom: ethermint.PhotonCoin},
|
||||
{Denom: ethermint.AttoPhoton},
|
||||
}
|
||||
suite.ctx = suite.ctx.WithMinGasPrices(invalidGas)
|
||||
},
|
||||
|
@ -26,7 +26,7 @@ type StateDBTestSuite struct {
|
||||
suite.Suite
|
||||
|
||||
ctx sdk.Context
|
||||
app *app.InjectiveApp
|
||||
app *app.EthermintApp
|
||||
stateDB *types.CommitStateDB
|
||||
address ethcmn.Address
|
||||
stateObject types.StateObject
|
||||
|
Loading…
Reference in New Issue
Block a user