From d52d74582aef73f22f35d2ae12042d9f11b77ab2 Mon Sep 17 00:00:00 2001 From: Adrian Brink Date: Mon, 30 Apr 2018 16:24:46 -0700 Subject: [PATCH] Change fermion to steak --- cmd/gaia/app/app_test.go | 4 ++-- cmd/gaia/app/genesis.go | 4 ++-- cmd/gaia/cli_test/cli_test.go | 20 ++++++++++---------- docs/old/staking/public-testnet.rst | 4 ++-- docs/sdk/lcd-rest-api.yaml | 2 +- docs/staking/intro.rst | 4 ++-- docs/staking/testnet.rst | 4 ++-- x/stake/client/cli/flags.go | 2 +- x/stake/handler_test.go | 4 ++-- x/stake/msg.go | 2 +- x/stake/msg_test.go | 6 +++--- x/stake/test_common.go | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cmd/gaia/app/app_test.go b/cmd/gaia/app/app_test.go index 7212159999..25c6b2d97b 100644 --- a/cmd/gaia/app/app_test.go +++ b/cmd/gaia/app/app_test.go @@ -369,9 +369,9 @@ func TestIBCMsgs(t *testing.T) { func TestStakeMsgs(t *testing.T) { gapp := newGaiaApp() - genCoins, err := sdk.ParseCoins("42fermion") + genCoins, err := sdk.ParseCoins("42steak") require.Nil(t, err) - bondCoin, err := sdk.ParseCoin("10fermion") + bondCoin, err := sdk.ParseCoin("10steak") require.Nil(t, err) acc1 := &auth.BaseAccount{ diff --git a/cmd/gaia/app/genesis.go b/cmd/gaia/app/genesis.go index 7d0fb01d0c..9d88953cf6 100644 --- a/cmd/gaia/app/genesis.go +++ b/cmd/gaia/app/genesis.go @@ -146,11 +146,11 @@ func GaiaAppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (appState jso return } - // create the genesis account, give'm few fermions and a buncha token with there name + // create the genesis account, give'm few steaks and a buncha token with there name accAuth := auth.NewBaseAccountWithAddress(genTx.Address) accAuth.Coins = sdk.Coins{ {genTx.Name + "Token", 1000}, - {"fermion", freeFermionsAcc}, + {"steak", freeFermionsAcc}, } acc := NewGenesisAccount(&accAuth) genaccs[i] = acc diff --git a/cmd/gaia/cli_test/cli_test.go b/cmd/gaia/cli_test/cli_test.go index 01f2e15631..102c4ada98 100644 --- a/cmd/gaia/cli_test/cli_test.go +++ b/cmd/gaia/cli_test/cli_test.go @@ -39,15 +39,15 @@ func TestGaiaCLISend(t *testing.T) { barAddr, _ := executeGetAddrPK(t, "gaiacli keys show bar --output=json") fooAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooAddr, flags)) - assert.Equal(t, int64(50), fooAcc.GetCoins().AmountOf("fermion")) + assert.Equal(t, int64(50), fooAcc.GetCoins().AmountOf("steak")) - executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10fermion --to=%v --name=foo", flags, barAddr), pass) + executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%v --name=foo", flags, barAddr), pass) time.Sleep(time.Second * 3) // waiting for some blocks to pass barAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barAddr, flags)) - assert.Equal(t, int64(10), barAcc.GetCoins().AmountOf("fermion")) + assert.Equal(t, int64(10), barAcc.GetCoins().AmountOf("steak")) fooAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooAddr, flags)) - assert.Equal(t, int64(40), fooAcc.GetCoins().AmountOf("fermion")) + assert.Equal(t, int64(40), fooAcc.GetCoins().AmountOf("steak")) } func TestGaiaCLIDeclareCandidacy(t *testing.T) { @@ -70,26 +70,26 @@ func TestGaiaCLIDeclareCandidacy(t *testing.T) { fooAddr, _ := executeGetAddrPK(t, "gaiacli keys show foo --output=json") barAddr, barPubKey := executeGetAddrPK(t, "gaiacli keys show bar --output=json") - executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10fermion --to=%v --name=foo", flags, barAddr), pass) + executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%v --name=foo", flags, barAddr), pass) time.Sleep(time.Second * 3) // waiting for some blocks to pass fooAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooAddr, flags)) - assert.Equal(t, int64(40), fooAcc.GetCoins().AmountOf("fermion")) + assert.Equal(t, int64(40), fooAcc.GetCoins().AmountOf("steak")) barAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barAddr, flags)) - assert.Equal(t, int64(10), barAcc.GetCoins().AmountOf("fermion")) + assert.Equal(t, int64(10), barAcc.GetCoins().AmountOf("steak")) // declare candidacy declStr := fmt.Sprintf("gaiacli declare-candidacy %v", flags) declStr += fmt.Sprintf(" --name=%v", "bar") declStr += fmt.Sprintf(" --address-candidate=%v", barAddr) declStr += fmt.Sprintf(" --pubkey=%v", barPubKey) - declStr += fmt.Sprintf(" --amount=%v", "3fermion") + declStr += fmt.Sprintf(" --amount=%v", "3steak") declStr += fmt.Sprintf(" --moniker=%v", "bar-vally") fmt.Printf("debug declStr: %v\n", declStr) executeWrite(t, declStr, pass) time.Sleep(time.Second) // waiting for some blocks to pass barAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barAddr, flags)) - assert.Equal(t, int64(7), barAcc.GetCoins().AmountOf("fermion")) + assert.Equal(t, int64(7), barAcc.GetCoins().AmountOf("steak")) candidate := executeGetCandidate(t, fmt.Sprintf("gaiacli candidate %v --address-candidate=%v", flags, barAddr)) assert.Equal(t, candidate.Address.String(), barAddr) assert.Equal(t, int64(3), candidate.Assets.Evaluate()) @@ -106,7 +106,7 @@ func TestGaiaCLIDeclareCandidacy(t *testing.T) { //executeWrite(t, unbondStr, pass) //time.Sleep(time.Second * 3) // waiting for some blocks to pass //barAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barAddr, flags)) - //assert.Equal(t, int64(99998), barAcc.GetCoins().AmountOf("fermion")) + //assert.Equal(t, int64(99998), barAcc.GetCoins().AmountOf("steak")) //candidate = executeGetCandidate(t, fmt.Sprintf("gaiacli candidate %v --address-candidate=%v", flags, barAddr)) //assert.Equal(t, int64(2), candidate.Assets.Evaluate()) } diff --git a/docs/old/staking/public-testnet.rst b/docs/old/staking/public-testnet.rst index 440a084499..6401636428 100644 --- a/docs/old/staking/public-testnet.rst +++ b/docs/old/staking/public-testnet.rst @@ -12,7 +12,7 @@ Get Tokens If you haven't already `created a key <../key-management.html>`__, do so now. Copy your key's address and enter it into `this utility `__ which will send you -some ``fermion`` testnet tokens. +some ``steak`` testnet tokens. Get Files --------- @@ -59,6 +59,6 @@ and check our balance: Where ``$MYADDR`` is the address originally generated by ``gaia keys new bob``. -You are now ready to declare candidacy or delegate some fermions. See the +You are now ready to declare candidacy or delegate some steaks. See the `staking module overview <./staking-module.html>`__ for more information on using the ``gaia client``. diff --git a/docs/sdk/lcd-rest-api.yaml b/docs/sdk/lcd-rest-api.yaml index eb9ec714bb..7d38274c0a 100644 --- a/docs/sdk/lcd-rest-api.yaml +++ b/docs/sdk/lcd-rest-api.yaml @@ -547,7 +547,7 @@ components: properties: denom: type: string - example: fermion + example: steak amount: type: number example: 50 diff --git a/docs/staking/intro.rst b/docs/staking/intro.rst index 9611368941..7b5acb9863 100644 --- a/docs/staking/intro.rst +++ b/docs/staking/intro.rst @@ -107,7 +107,7 @@ The ``genesis.json`` should look something like: "address": "1D9B2356CAADF46D3EE3488E3CCE3028B4283DEE", "coins": [ { - "denom": "fermion", + "denom": "steak", "amount": 100000 } ] @@ -150,7 +150,7 @@ The ``genesis.json`` should look something like: "denom": 100 }, "max_validators": 100, - "bond_denom": "fermion" + "bond_denom": "steak" } } }, diff --git a/docs/staking/testnet.rst b/docs/staking/testnet.rst index ab8c1644db..92aa93eb26 100644 --- a/docs/staking/testnet.rst +++ b/docs/staking/testnet.rst @@ -46,13 +46,13 @@ Nice. We can also lookup the validator set: gaiacli validatorset -Then, we try to transfer some ``fermion`` to another account: +Then, we try to transfer some ``steak`` to another account: :: gaiacli account gaiacli account - gaiacli send --amount=10fermion --to= --name=foo --chain-id=test-chain + gaiacli send --amount=10steak --to= --name=foo --chain-id=test-chain **Note:** We need to be careful with the ``chain-id`` and ``sequence`` diff --git a/x/stake/client/cli/flags.go b/x/stake/client/cli/flags.go index bf8246b34c..98ea3bcced 100644 --- a/x/stake/client/cli/flags.go +++ b/x/stake/client/cli/flags.go @@ -30,7 +30,7 @@ var ( func init() { fsPk.String(FlagPubKey, "", "Go-Amino encoded hex PubKey of the validator-candidate. For Ed25519 the go-amino prepend hex is 1624de6220") - fsAmount.String(FlagAmount, "1fermion", "Amount of coins to bond") + fsAmount.String(FlagAmount, "1steak", "Amount of coins to bond") fsShares.String(FlagShares, "", "Amount of shares to unbond, either in decimal or keyword MAX (ex. 1.23456789, 99, MAX)") fsDescription.String(FlagMoniker, "", "validator-candidate name") fsDescription.String(FlagIdentity, "", "optional keybase signature") diff --git a/x/stake/handler_test.go b/x/stake/handler_test.go index 1240e4e6c6..b4db952f0e 100644 --- a/x/stake/handler_test.go +++ b/x/stake/handler_test.go @@ -18,7 +18,7 @@ func newTestMsgDeclareCandidacy(address sdk.Address, pubKey crypto.PubKey, amt i return MsgDeclareCandidacy{ Description: Description{}, CandidateAddr: address, - Bond: sdk.Coin{"fermion", amt}, + Bond: sdk.Coin{"steak", amt}, PubKey: pubKey, } } @@ -27,7 +27,7 @@ func newTestMsgDelegate(delegatorAddr, candidateAddr sdk.Address, amt int64) Msg return MsgDelegate{ DelegatorAddr: delegatorAddr, CandidateAddr: candidateAddr, - Bond: sdk.Coin{"fermion", amt}, + Bond: sdk.Coin{"steak", amt}, } } diff --git a/x/stake/msg.go b/x/stake/msg.go index 6e8101f96e..28e02bea7b 100644 --- a/x/stake/msg.go +++ b/x/stake/msg.go @@ -14,7 +14,7 @@ const MsgType = "stake" // initialize at genesis - to allow for the same tests we should should make // the ValidateBasic() function a return from an initializable function // ValidateBasic(bondDenom string) function -const StakingToken = "fermion" +const StakingToken = "steak" //Verify interface at compile time var _, _, _, _ sdk.Msg = &MsgDeclareCandidacy{}, &MsgEditCandidacy{}, &MsgDelegate{}, &MsgUnbond{} diff --git a/x/stake/msg_test.go b/x/stake/msg_test.go index b3e2bbe3a2..19e8335bee 100644 --- a/x/stake/msg_test.go +++ b/x/stake/msg_test.go @@ -10,9 +10,9 @@ import ( ) var ( - coinPos = sdk.Coin{"fermion", 1000} - coinZero = sdk.Coin{"fermion", 0} - coinNeg = sdk.Coin{"fermion", -10000} + coinPos = sdk.Coin{"steak", 1000} + coinZero = sdk.Coin{"steak", 0} + coinNeg = sdk.Coin{"steak", -10000} coinPosNotAtoms = sdk.Coin{"foo", 10000} coinZeroNotAtoms = sdk.Coin{"foo", 0} coinNegNotAtoms = sdk.Coin{"foo", -10000} diff --git a/x/stake/test_common.go b/x/stake/test_common.go index 4d11ea937d..189deeff03 100644 --- a/x/stake/test_common.go +++ b/x/stake/test_common.go @@ -83,7 +83,7 @@ func defaultParams() Params { InflationMin: sdk.NewRat(7, 100), GoalBonded: sdk.NewRat(67, 100), MaxValidators: 100, - BondDenom: "fermion", + BondDenom: "steak", } } @@ -142,7 +142,7 @@ func paramsNoInflation() Params { InflationMin: sdk.ZeroRat(), GoalBonded: sdk.NewRat(67, 100), MaxValidators: 100, - BondDenom: "fermion", + BondDenom: "steak", } }