Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
mars committed Jan 8, 2019
1 parent 3b42558 commit a7c5e4f
Show file tree
Hide file tree
Showing 12 changed files with 132 additions and 16 deletions.
15 changes: 13 additions & 2 deletions account/accounts_test.go
View file
Expand Up @@ -11,6 +11,8 @@ import (

"github.com/vapor/blockchain/pseudohsm"
"github.com/vapor/blockchain/signers"
"github.com/vapor/common"
"github.com/vapor/config"
"github.com/vapor/consensus"
"github.com/vapor/crypto/ed25519/chainkd"
"github.com/vapor/database/leveldb"
Expand Down Expand Up @@ -207,8 +209,17 @@ func TestGetAccountIndexKey(t *testing.T) {

func mockAccountManager(t *testing.T) *Manager {

consensus.ActiveNetParams.Signer = "78673764e0ba91a4c5ba9ec0c8c23c69e3d73bf27970e05e0a977e81e13bde475264d3b177a96646bc0ce517ae7fd63504c183ab6d330dea184331a4cf5912d5"

config.CommonConfig = config.DefaultConfig()
consensus.SoloNetParams.Signer = "78673764e0ba91a4c5ba9ec0c8c23c69e3d73bf27970e05e0a977e81e13bde475264d3b177a96646bc0ce517ae7fd63504c183ab6d330dea184331a4cf5912d5"
config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}
config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
}
dirPath, err := ioutil.TempDir(".", "")
if err != nil {
t.Fatal(err)
Expand Down
14 changes: 13 additions & 1 deletion asset/asset_test.go
View file
Expand Up @@ -11,6 +11,8 @@ import (

dbm "github.com/tendermint/tmlibs/db"

"github.com/vapor/common"
"github.com/vapor/config"
"github.com/vapor/consensus"
"github.com/vapor/crypto/ed25519/chainkd"
"github.com/vapor/database/leveldb"
Expand Down Expand Up @@ -161,7 +163,17 @@ func mockChain(testDB dbm.DB) (*protocol.Chain, error) {
}

func mockNewRegistry(t *testing.T) *Registry {
consensus.ActiveNetParams.Signer = "78673764e0ba91a4c5ba9ec0c8c23c69e3d73bf27970e05e0a977e81e13bde475264d3b177a96646bc0ce517ae7fd63504c183ab6d330dea184331a4cf5912d5"
config.CommonConfig = config.DefaultConfig()
consensus.SoloNetParams.Signer = "78673764e0ba91a4c5ba9ec0c8c23c69e3d73bf27970e05e0a977e81e13bde475264d3b177a96646bc0ce517ae7fd63504c183ab6d330dea184331a4cf5912d5"
config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}
config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
}
dirPath, err := ioutil.TempDir(".", "")
if err != nil {
t.Fatal(err)
Expand Down
1 change: 0 additions & 1 deletion chain/chain.go
View file
Expand Up @@ -18,5 +18,4 @@ type Chain interface {
InMainChain(bc.Hash) bool
ProcessBlock(*types.Block) (bool, error)
ValidateTx(*types.Tx) (bool, error)
GetAuthoritys(string) string
}
23 changes: 22 additions & 1 deletion database/leveldb/store_test.go
View file
Expand Up @@ -4,7 +4,9 @@ import (
"os"
"testing"

"github.com/vapor/common"
"github.com/vapor/config"
"github.com/vapor/consensus"
"github.com/vapor/protocol/bc"
"github.com/vapor/protocol/bc/types"

Expand All @@ -15,7 +17,16 @@ func TestLoadBlockIndex(t *testing.T) {
defer os.RemoveAll("temp")
testDB := dbm.NewDB("testdb", "leveldb", "temp")
store := NewStore(testDB)

config.CommonConfig = config.DefaultConfig()
config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}
config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
}
block := config.GenesisBlock()
txStatus := bc.NewTransactionStatus()

Expand Down Expand Up @@ -70,6 +81,16 @@ func TestLoadBlockIndexBestHeight(t *testing.T) {
testDB := dbm.NewDB("testdb", "leveldb", "temp")
store := NewStore(testDB)
var savedBlocks []types.Block
config.CommonConfig = config.DefaultConfig()
config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}
config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
}

for _, c := range cases {
block := config.GenesisBlock()
Expand Down
12 changes: 12 additions & 0 deletions protocol/block_test.go
View file
Expand Up @@ -3,13 +3,25 @@ package protocol
import (
"testing"

"github.com/vapor/common"
"github.com/vapor/config"
"github.com/vapor/consensus"
"github.com/vapor/protocol/state"
"github.com/vapor/testutil"
)

func TestCalcReorganizeNodes(t *testing.T) {
c := &Chain{index: state.NewBlockIndex()}
config.CommonConfig = config.DefaultConfig()
config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}
config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
}
header := config.GenesisBlock().BlockHeader
initNode, err := state.NewBlockNode(&header, nil)
if err != nil {
Expand Down
4 changes: 0 additions & 4 deletions protocol/protocol.go
View file
Expand Up @@ -67,10 +67,6 @@ func (c *Chain) SetPosition(position uint64) {
c.position = position
}

func (c *Chain) GetAuthoritys(key string) string {
return c.Authoritys[key]
}

func (c *Chain) SetConsensusEngine(engine engine.Engine) {
c.engine = engine
}
Expand Down
2 changes: 2 additions & 0 deletions protocol/txpool_test.go
View file
Expand Up @@ -78,6 +78,8 @@ func (s *mockStore) SaveBlock(*types.Block, *bc.TransactionStatus) error
func (s *mockStore) SaveChainStatus(*state.BlockNode, *state.UtxoViewpoint) error { return nil }
func (s *mockStore) IsWithdrawSpent(hash *bc.Hash) bool { return true }
func (s *mockStore) SetWithdrawSpent(hash *bc.Hash) {}
func (s *mockStore) Set(hash *bc.Hash, data []byte) error { return nil }
func (s *mockStore) Get(hash *bc.Hash) ([]byte, error) { return nil, nil }

func TestAddOrphan(t *testing.T) {
cases := []struct {
Expand Down
14 changes: 14 additions & 0 deletions test/util.go
View file
Expand Up @@ -9,6 +9,8 @@ import (
"github.com/vapor/account"
"github.com/vapor/blockchain/pseudohsm"
"github.com/vapor/blockchain/txbuilder"
"github.com/vapor/common"
"github.com/vapor/config"
"github.com/vapor/consensus"
"github.com/vapor/crypto/ed25519/chainkd"
"github.com/vapor/database/leveldb"
Expand All @@ -25,6 +27,18 @@ const (

// MockChain mock chain with genesis block
func MockChain(testDB dbm.DB) (*protocol.Chain, *leveldb.Store, *protocol.TxPool, error) {
config.CommonConfig = config.DefaultConfig()
consensus.SoloNetParams.Signer = "78673764e0ba91a4c5ba9ec0c8c23c69e3d73bf27970e05e0a977e81e13bde475264d3b177a96646bc0ce517ae7fd63504c183ab6d330dea184331a4cf5912d5"
config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
if err != nil {
return nil, nil, nil, err
}
config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
}

store := leveldb.NewStore(testDB)
txPool := protocol.NewTxPool(store)
chain, err := protocol.NewChain(store, txPool)
Expand Down
10 changes: 9 additions & 1 deletion test/wallet_test_util.go
View file
Expand Up @@ -13,6 +13,9 @@ import (
"github.com/vapor/asset"
"github.com/vapor/blockchain/pseudohsm"
"github.com/vapor/blockchain/signers"
"github.com/vapor/common"
"github.com/vapor/config"
"github.com/vapor/consensus"
"github.com/vapor/crypto/ed25519/chainkd"
"github.com/vapor/protocol"
"github.com/vapor/protocol/bc/types"
Expand Down Expand Up @@ -256,10 +259,15 @@ func (cfg *walletTestConfig) Run() error {
if err != nil {
return err
}
config.CommonConfig.Consensus.Dpos.Coinbase = "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep"
address, err := common.DecodeAddress(config.CommonConfig.Consensus.Dpos.Coinbase, &consensus.SoloNetParams)
if err != nil {
return err
}
walletDB := dbm.NewDB("wallet", "leveldb", path.Join(dirPath, "wallet_db"))
accountManager := account.NewManager(walletDB, chain)
assets := asset.NewRegistry(walletDB, chain)
wallet, err := w.NewWallet(walletDB, accountManager, assets, hsm, chain)
wallet, err := w.NewWallet(walletDB, accountManager, assets, hsm, chain, address)
if err != nil {
return err
}
Expand Down
20 changes: 19 additions & 1 deletion wallet/unconfirmed_test.go
View file
Expand Up @@ -7,6 +7,8 @@ import (

dbm "github.com/tendermint/tmlibs/db"
"github.com/vapor/blockchain/signers"
"github.com/vapor/common"
"github.com/vapor/config"

"github.com/vapor/account"
"github.com/vapor/asset"
Expand All @@ -19,6 +21,22 @@ import (
)

func TestWalletUnconfirmedTxs(t *testing.T) {
config.CommonConfig = config.DefaultConfig()
consensus.SoloNetParams.Signer = "78673764e0ba91a4c5ba9ec0c8c23c69e3d73bf27970e05e0a977e81e13bde475264d3b177a96646bc0ce517ae7fd63504c183ab6d330dea184331a4cf5912d5"
config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}
config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
}
config.CommonConfig.Consensus.Dpos.Coinbase = "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep"
address, err := common.DecodeAddress(config.CommonConfig.Consensus.Dpos.Coinbase, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}
dirPath, err := ioutil.TempDir(".", "")
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -57,7 +75,7 @@ func TestWalletUnconfirmedTxs(t *testing.T) {
t.Fatal(err)
}

w := mockWallet(testDB, accountManager, reg, nil)
w := mockWallet(testDB, accountManager, reg, nil, address)
utxos := []*account.UTXO{}
btmUtxo := mockUTXO(controlProg, consensus.BTMAssetID)
utxos = append(utxos, btmUtxo)
Expand Down
8 changes: 6 additions & 2 deletions wallet/utxo.go
View file
Expand Up @@ -127,8 +127,12 @@ func (w *Wallet) detachUtxos(batch db.Batch, b *types.Block, txStatus *bc.Transa

func (w *Wallet) filterAccountUtxo(utxos []*account.UTXO) []*account.UTXO {
outsByScript := make(map[string][]*account.UTXO, len(utxos))
redeemContract := w.dposAddress.ScriptAddress()
program, _ := vmutil.P2WPKHProgram(redeemContract)
var program []byte
if w.dposAddress != nil {
redeemContract := w.dposAddress.ScriptAddress()
program, _ = vmutil.P2WPKHProgram(redeemContract)
}

isDposAddress := false
for _, utxo := range utxos {
scriptStr := string(utxo.ControlProgram)
Expand Down
25 changes: 22 additions & 3 deletions wallet/wallet_test.go
View file
Expand Up @@ -8,6 +8,8 @@ import (

dbm "github.com/tendermint/tmlibs/db"
"github.com/vapor/blockchain/signers"
"github.com/vapor/common"
"github.com/vapor/config"

"github.com/vapor/account"
"github.com/vapor/asset"
Expand All @@ -22,6 +24,23 @@ import (
)

func TestWalletUpdate(t *testing.T) {
config.CommonConfig = config.DefaultConfig()
consensus.SoloNetParams.Signer = "78673764e0ba91a4c5ba9ec0c8c23c69e3d73bf27970e05e0a977e81e13bde475264d3b177a96646bc0ce517ae7fd63504c183ab6d330dea184331a4cf5912d5"
config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}
config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
}
config.CommonConfig.Consensus.Dpos.Coinbase = "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep"
address, err := common.DecodeAddress(config.CommonConfig.Consensus.Dpos.Coinbase, &consensus.SoloNetParams)
if err != nil {
t.Fatal(err)
}

dirPath, err := ioutil.TempDir(".", "")
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -84,8 +103,7 @@ func TestWalletUpdate(t *testing.T) {
txStatus := bc.NewTransactionStatus()
txStatus.SetStatus(0, false)
store.SaveBlock(block, txStatus)

w := mockWallet(testDB, accountManager, reg, chain)
w := mockWallet(testDB, accountManager, reg, chain, address)
err = w.AttachBlock(block)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -137,13 +155,14 @@ func mockTxData(utxos []*account.UTXO, testAccount *account.Account) (*txbuilder
return tplBuilder.Build()
}

func mockWallet(walletDB dbm.DB, account *account.Manager, asset *asset.Registry, chain *protocol.Chain) *Wallet {
func mockWallet(walletDB dbm.DB, account *account.Manager, asset *asset.Registry, chain *protocol.Chain, address common.Address) *Wallet {
wallet := &Wallet{
DB: walletDB,
AccountMgr: account,
AssetReg: asset,
chain: chain,
RecoveryMgr: newRecoveryManager(walletDB, account),
dposAddress: address,
}
return wallet
}
Expand Down

0 comments on commit a7c5e4f

Please sign in to comment.