LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

crypto.Address -> sdk.Address

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
x/auth/baseaccount.go
+4 -4
View File
@@ -17,13 +17,13 @@ var _ sdk.Account = (*BaseAccount)(nil)
// Extend this by embedding this in your AppAccount.
// See the examples/basecoin/types/account.go for an example.
type BaseAccount struct {
Address crypto.Address `json:"address"`
Address sdk.Address `json:"address"`
Coins sdk.Coins `json:"coins"`
PubKey crypto.PubKey `json:"public_key"`
Sequence int64 `json:"sequence"`
}
func NewBaseAccountWithAddress(addr crypto.Address) BaseAccount {
func NewBaseAccountWithAddress(addr sdk.Address) BaseAccount {
return BaseAccount{
Address: addr,
}
@@ -40,12 +40,12 @@ func (acc *BaseAccount) Set(key interface{}, value interface{}) error {
}
// Implements sdk.Account.
func (acc BaseAccount) GetAddress() crypto.Address {
func (acc BaseAccount) GetAddress() sdk.Address {
return acc.Address
}
// Implements sdk.Account.
func (acc *BaseAccount) SetAddress(addr crypto.Address) error {
func (acc *BaseAccount) SetAddress(addr sdk.Address) error {
if len(acc.Address) != 0 {
return errors.New("cannot override BaseAccount address")
}
x/auth/commands/account.go
+1 -2
View File
@@ -8,7 +8,6 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
crypto "github.com/tendermint/go-crypto"
wire "github.com/tendermint/go-wire"
"github.com/cosmos/cosmos-sdk/client"
@@ -61,7 +60,7 @@ func (c commander) getAccountCmd(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
key := crypto.Address(bz)
key := sdk.Address(bz)
res, err := client.Query(key, c.storeName)
x/auth/mapper.go
+2 -3
View File
@@ -4,7 +4,6 @@ import (
"fmt"
"reflect"
crypto "github.com/tendermint/go-crypto"
wire "github.com/tendermint/go-wire"
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -66,14 +65,14 @@ func (am accountMapper) Seal() sealedAccountMapper {
}
// Implements sdk.AccountMapper.
func (am accountMapper) NewAccountWithAddress(ctx sdk.Context, addr crypto.Address) sdk.Account {
func (am accountMapper) NewAccountWithAddress(ctx sdk.Context, addr sdk.Address) sdk.Account {
acc := am.clonePrototype()
acc.SetAddress(addr)
return acc
}
// Implements sdk.AccountMapper.
func (am accountMapper) GetAccount(ctx sdk.Context, addr crypto.Address) sdk.Account {
func (am accountMapper) GetAccount(ctx sdk.Context, addr sdk.Address) sdk.Account {
store := ctx.KVStore(am.key)
bz := store.Get(addr)
if bz == nil {
x/bank/commands/sendtx.go
+2 -3
View File
@@ -8,7 +8,6 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
crypto "github.com/tendermint/go-crypto"
wire "github.com/tendermint/go-wire"
"github.com/cosmos/cosmos-sdk/client"
@@ -105,7 +104,7 @@ func (c commander) buildTx() ([]byte, error) {
return txBytes, nil
}
func buildMsg(from crypto.Address) (sdk.Msg, error) {
func buildMsg(from sdk.Address) (sdk.Msg, error) {
// parse coins
amount := viper.GetString(flagAmount)
@@ -120,7 +119,7 @@ func buildMsg(from crypto.Address) (sdk.Msg, error) {
if err != nil {
return nil, err
}
to := crypto.Address(bz)
to := sdk.Address(bz)
input := bank.NewInput(from, coins)
output := bank.NewOutput(to, coins)
x/bank/mapper.go
+2 -4
View File
@@ -3,8 +3,6 @@ package bank
import (
"fmt"
crypto "github.com/tendermint/go-crypto"
sdk "github.com/cosmos/cosmos-sdk/types"
)
@@ -19,7 +17,7 @@ func NewCoinKeeper(am sdk.AccountMapper) CoinKeeper {
}
// SubtractCoins subtracts amt from the coins at the addr.
func (ck CoinKeeper) SubtractCoins(ctx sdk.Context, addr crypto.Address, amt sdk.Coins) (sdk.Coins, sdk.Error) {
func (ck CoinKeeper) SubtractCoins(ctx sdk.Context, addr sdk.Address, amt sdk.Coins) (sdk.Coins, sdk.Error) {
acc := ck.am.GetAccount(ctx, addr)
if acc == nil {
return amt, sdk.ErrUnrecognizedAddress(addr)
@@ -37,7 +35,7 @@ func (ck CoinKeeper) SubtractCoins(ctx sdk.Context, addr crypto.Address, amt sdk
}
// AddCoins adds amt to the coins at the addr.
func (ck CoinKeeper) AddCoins(ctx sdk.Context, addr crypto.Address, amt sdk.Coins) (sdk.Coins, sdk.Error) {
func (ck CoinKeeper) AddCoins(ctx sdk.Context, addr sdk.Address, amt sdk.Coins) (sdk.Coins, sdk.Error) {
acc := ck.am.GetAccount(ctx, addr)
if acc == nil {
acc = ck.am.NewAccountWithAddress(ctx, addr)
x/bank/tx.go
+11 -11
View File
@@ -73,8 +73,8 @@ func (msg SendMsg) GetSignBytes() []byte {
}
// Implements Msg.
func (msg SendMsg) GetSigners() []crypto.Address {
addrs := make([]crypto.Address, len(msg.Inputs))
func (msg SendMsg) GetSigners() []sdk.Address {
addrs := make([]sdk.Address, len(msg.Inputs))
for i, in := range msg.Inputs {
addrs[i] = in.Address
}
@@ -86,12 +86,12 @@ func (msg SendMsg) GetSigners() []crypto.Address {
// IssueMsg - high level transaction of the coin module
type IssueMsg struct {
Banker crypto.Address `json:"banker"`
Banker sdk.Address `json:"banker"`
Outputs []Output `json:"outputs"`
}
// NewIssueMsg - construct arbitrary multi-in, multi-out send msg.
func NewIssueMsg(banker crypto.Address, out []Output) IssueMsg {
func NewIssueMsg(banker sdk.Address, out []Output) IssueMsg {
return IssueMsg{Banker: banker, Outputs: out}
}
@@ -131,15 +131,15 @@ func (msg IssueMsg) GetSignBytes() []byte {
}
// Implements Msg.
func (msg IssueMsg) GetSigners() []crypto.Address {
return []crypto.Address{msg.Banker}
func (msg IssueMsg) GetSigners() []sdk.Address {
return []sdk.Address{msg.Banker}
}
//----------------------------------------
// Input
type Input struct {
Address crypto.Address `json:"address"`
Address sdk.Address `json:"address"`
Coins sdk.Coins `json:"coins"`
Sequence int64 `json:"sequence"`
@@ -168,7 +168,7 @@ func (in Input) String() string {
}
// NewInput - create a transaction input, used with SendMsg
func NewInput(addr crypto.Address, coins sdk.Coins) Input {
func NewInput(addr sdk.Address, coins sdk.Coins) Input {
input := Input{
Address: addr,
Coins: coins,
@@ -177,7 +177,7 @@ func NewInput(addr crypto.Address, coins sdk.Coins) Input {
}
// NewInputWithSequence - create a transaction input, used with SendMsg
func NewInputWithSequence(addr crypto.Address, coins sdk.Coins, seq int64) Input {
func NewInputWithSequence(addr sdk.Address, coins sdk.Coins, seq int64) Input {
input := NewInput(addr, coins)
input.Sequence = seq
return input
@@ -187,7 +187,7 @@ func NewInputWithSequence(addr crypto.Address, coins sdk.Coins, seq int64) Input
// Output
type Output struct {
Address crypto.Address `json:"address"`
Address sdk.Address `json:"address"`
Coins sdk.Coins `json:"coins"`
}
@@ -210,7 +210,7 @@ func (out Output) String() string {
}
// NewOutput - create a transaction output, used with SendMsg
func NewOutput(addr crypto.Address, coins sdk.Coins) Output {
func NewOutput(addr sdk.Address, coins sdk.Coins) Output {
output := Output{
Address: addr,
Coins: coins,
x/bank/tx_test.go
+30 -32
View File
@@ -6,8 +6,6 @@ import (
"github.com/stretchr/testify/assert"
crypto "github.com/tendermint/go-crypto"
sdk "github.com/cosmos/cosmos-sdk/types"
)
@@ -18,14 +16,14 @@ func TestSendMsgType(t *testing.T) {
var msg = SendMsg{
Inputs: []Input{
{
Address: crypto.Address([]byte("input")),
Address: sdk.Address([]byte("input")),
Coins: sdk.Coins{{"atom", 10}},
Sequence: 1,
},
},
Outputs: []Output{
{
Address: crypto.Address([]byte("output")),
Address: sdk.Address([]byte("output")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -36,12 +34,12 @@ func TestSendMsgType(t *testing.T) {
}
func TestInputValidation(t *testing.T) {
addr1 := crypto.Address([]byte{1, 2})
addr2 := crypto.Address([]byte{7, 8})
addr1 := sdk.Address([]byte{1, 2})
addr2 := sdk.Address([]byte{7, 8})
someCoins := sdk.Coins{{"atom", 123}}
multiCoins := sdk.Coins{{"atom", 123}, {"eth", 20}}
var emptyAddr crypto.Address
var emptyAddr sdk.Address
emptyCoins := sdk.Coins{}
emptyCoins2 := sdk.Coins{{"eth", 0}}
someEmptyCoins := sdk.Coins{{"eth", 10}, {"atom", 0}}
@@ -80,12 +78,12 @@ func TestInputValidation(t *testing.T) {
}
func TestOutputValidation(t *testing.T) {
addr1 := crypto.Address([]byte{1, 2})
addr2 := crypto.Address([]byte{7, 8})
addr1 := sdk.Address([]byte{1, 2})
addr2 := sdk.Address([]byte{7, 8})
someCoins := sdk.Coins{{"atom", 123}}
multiCoins := sdk.Coins{{"atom", 123}, {"eth", 20}}
var emptyAddr crypto.Address
var emptyAddr sdk.Address
emptyCoins := sdk.Coins{}
emptyCoins2 := sdk.Coins{{"eth", 0}}
someEmptyCoins := sdk.Coins{{"eth", 10}, {"atom", 0}}
@@ -122,8 +120,8 @@ func TestOutputValidation(t *testing.T) {
}
func TestSendMsgValidation(t *testing.T) {
addr1 := crypto.Address([]byte{1, 2})
addr2 := crypto.Address([]byte{7, 8})
addr1 := sdk.Address([]byte{1, 2})
addr2 := sdk.Address([]byte{7, 8})
atom123 := sdk.Coins{{"atom", 123}}
atom124 := sdk.Coins{{"atom", 124}}
eth123 := sdk.Coins{{"eth", 123}}
@@ -136,7 +134,7 @@ func TestSendMsgValidation(t *testing.T) {
output3 := NewOutput(addr2, eth123)
outputMulti := NewOutput(addr2, atom123eth123)
var emptyAddr crypto.Address
var emptyAddr sdk.Address
cases := []struct {
valid bool
@@ -194,14 +192,14 @@ func TestSendMsgString(t *testing.T) {
var msg = SendMsg{
Inputs: []Input{
{
Address: crypto.Address([]byte("input")),
Address: sdk.Address([]byte("input")),
Coins: sdk.Coins{{"atom", 10}},
Sequence: 1,
},
},
Outputs: []Output{
{
Address: crypto.Address([]byte("output")),
Address: sdk.Address([]byte("output")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -215,14 +213,14 @@ func TestSendMsgGet(t *testing.T) {
var msg = SendMsg{
Inputs: []Input{
{
Address: crypto.Address([]byte("input")),
Address: sdk.Address([]byte("input")),
Coins: sdk.Coins{{"atom", 10}},
Sequence: 1,
},
},
Outputs: []Output{
{
Address: crypto.Address([]byte("output")),
Address: sdk.Address([]byte("output")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -235,14 +233,14 @@ func TestSendMsgGetSignBytes(t *testing.T) {
var msg = SendMsg{
Inputs: []Input{
{
Address: crypto.Address([]byte("input")),
Address: sdk.Address([]byte("input")),
Coins: sdk.Coins{{"atom", 10}},
Sequence: 1,
},
},
Outputs: []Output{
{
Address: crypto.Address([]byte("output")),
Address: sdk.Address([]byte("output")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -256,13 +254,13 @@ func TestSendMsgGetSigners(t *testing.T) {
var msg = SendMsg{
Inputs: []Input{
{
Address: crypto.Address([]byte("input1")),
Address: sdk.Address([]byte("input1")),
},
{
Address: crypto.Address([]byte("input2")),
Address: sdk.Address([]byte("input2")),
},
{
Address: crypto.Address([]byte("input3")),
Address: sdk.Address([]byte("input3")),
},
},
}
@@ -273,7 +271,7 @@ func TestSendMsgGetSigners(t *testing.T) {
/*
// what to do w/ this test?
func TestSendMsgSigners(t *testing.T) {
signers := []crypto.Address{
signers := []sdk.Address{
{1, 2, 3},
{4, 5, 6},
{7, 8, 9},
@@ -300,10 +298,10 @@ func TestNewIssueMsg(t *testing.T) {
func TestIssueMsgType(t *testing.T) {
// Construct an IssueMsg
var msg = IssueMsg{
Banker: crypto.Address([]byte("input")),
Banker: sdk.Address([]byte("input")),
Outputs: []Output{
{
Address: crypto.Address([]byte("loan-from-bank")),
Address: sdk.Address([]byte("loan-from-bank")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -320,10 +318,10 @@ func TestIssueMsgValidation(t *testing.T) {
func TestIssueMsgString(t *testing.T) {
// Construct a IssueMsg
var msg = IssueMsg{
Banker: crypto.Address([]byte("input")),
Banker: sdk.Address([]byte("input")),
Outputs: []Output{
{
Address: crypto.Address([]byte("loan-from-bank")),
Address: sdk.Address([]byte("loan-from-bank")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -334,10 +332,10 @@ func TestIssueMsgString(t *testing.T) {
func TestIssueMsgGet(t *testing.T) {
var msg = IssueMsg{
Banker: crypto.Address([]byte("input")),
Banker: sdk.Address([]byte("input")),
Outputs: []Output{
{
Address: crypto.Address([]byte("loan-from-bank")),
Address: sdk.Address([]byte("loan-from-bank")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -348,10 +346,10 @@ func TestIssueMsgGet(t *testing.T) {
func TestIssueMsgGetSignBytes(t *testing.T) {
var msg = IssueMsg{
Banker: crypto.Address([]byte("input")),
Banker: sdk.Address([]byte("input")),
Outputs: []Output{
{
Address: crypto.Address([]byte("loan-from-bank")),
Address: sdk.Address([]byte("loan-from-bank")),
Coins: sdk.Coins{{"atom", 10}},
},
},
@@ -363,7 +361,7 @@ func TestIssueMsgGetSignBytes(t *testing.T) {
func TestIssueMsgGetSigners(t *testing.T) {
var msg = IssueMsg{
Banker: crypto.Address([]byte("onlyone")),
Banker: sdk.Address([]byte("onlyone")),
}
res := msg.GetSigners()
assert.Equal(t, fmt.Sprintf("%v", res), "[6F6E6C796F6E65]")