crypto.Address -> sdk.Address

This commit is contained in:
Ethan Buchman
2018-03-02 02:49:07 -05:00
parent a4825ece1a
commit 62d6a5de46
18 changed files with 93 additions and 105 deletions
+4 -4
View File
@@ -33,14 +33,14 @@ func TestSendMsg(t *testing.T) {
var msg = bank.SendMsg{
Inputs: []bank.Input{
{
Address: crypto.Address([]byte("input")),
Address: sdk.Address([]byte("input")),
Coins: sdk.Coins{{"atom", 10}},
Sequence: 1,
},
},
Outputs: []bank.Output{
{
Address: crypto.Address([]byte("output")),
Address: sdk.Address([]byte("output")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -155,14 +155,14 @@ func TestSendMsgWithAccounts(t *testing.T) {
var msg = bank.SendMsg{
Inputs: []bank.Input{
{
Address: crypto.Address(addr1),
Address: sdk.Address(addr1),
Coins: sdk.Coins{{"foocoin", 10}},
Sequence: 1,
},
},
Outputs: []bank.Output{
{
Address: crypto.Address(addr2),
Address: sdk.Address(addr2),
Coins: sdk.Coins{{"foocoin", 10}},
},
},
+3 -4
View File
@@ -3,7 +3,6 @@ package types
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
crypto "github.com/tendermint/go-crypto"
wire "github.com/tendermint/go-wire"
)
@@ -41,9 +40,9 @@ type GenesisState struct {
// GenesisAccount doesn't need pubkey or sequence
type GenesisAccount struct {
Name string `json:"name"`
Address crypto.Address `json:"address"`
Coins sdk.Coins `json:"coins"`
Name string `json:"name"`
Address sdk.Address `json:"address"`
Coins sdk.Coins `json:"coins"`
}
func NewGenesisAccount(aa *AppAccount) *GenesisAccount {
+2 -3
View File
@@ -4,7 +4,6 @@ import (
"bytes"
sdk "github.com/cosmos/cosmos-sdk/types"
crypto "github.com/tendermint/go-crypto"
)
// An sdk.Tx which is its own sdk.Msg.
@@ -44,7 +43,7 @@ func (tx kvstoreTx) ValidateBasic() sdk.Error {
return nil
}
func (tx kvstoreTx) GetSigners() []crypto.Address {
func (tx kvstoreTx) GetSigners() []sdk.Address {
return nil
}
@@ -52,7 +51,7 @@ func (tx kvstoreTx) GetSignatures() []sdk.StdSignature {
return nil
}
func (tx kvstoreTx) GetFeePayer() crypto.Address {
func (tx kvstoreTx) GetFeePayer() sdk.Address {
return nil
}