Skip to content

Commit f6ff20b

Browse files
reecepbcupsreecepbcups
committed
fix: macos whinny self
1 parent 2c53125 commit f6ff20b

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎simapp/scripts/test_ics_node.sh‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ if [ -z `which $BINARY` ]; then
4343
fi
4444
fi
4545

46-
alias BINARY="$BINARY --home=$HOME_DIR"
47-
4846
command -v $BINARY > /dev/null 2>&1 || { echo >&2 "$BINARY command not found. Ensure this is setup / properly installed in your GOPATH (make install)."; exit 1; }
4947
command -v jq > /dev/null 2>&1 || { echo >&2 "jq not installed. More info: https://stedolan.github.io/jq/download/"; exit 1; }
5048

@@ -71,15 +69,15 @@ from_scratch () {
7169
add_key() {
7270
key=$1
7371
mnemonic=$2
74-
echo $mnemonic | BINARY keys add $key --keyring-backend $KEYRING --algo $KEYALGO --recover
72+
echo $mnemonic | $BINARY keys add $key --keyring-backend $KEYRING --algo $KEYALGO --home $HOME_DIR --recover
7573
}
7674

7775
# cosmos1efd63aw40lxf3n4mhf7dzhjkr453axur6cpk92
7876
add_key $KEY "decorate bright ozone fork gallery riot bus exhaust worth way bone indoor calm squirrel merry zero scheme cotton until shop any excess stage laundry"
7977
# cosmos1hj5fveer5cjtn4wd6wstzugjfdxzl0xpxvjjvr
8078
add_key $KEY2 "wealth flavor believe regret funny network recall kiss grape useless pepper cram hint member few certain unveil rather brick bargain curious require crowd raise"
8179

82-
BINARY init $MONIKER --chain-id $CHAIN_ID --overwrite --default-denom $DENOM
80+
$BINARY init $MONIKER --chain-id $CHAIN_ID --home $HOME_DIR --overwrite --default-denom $DENOM
8381

8482
update_test_genesis () {
8583
cat $HOME_DIR/config/genesis.json | jq "$1" > $HOME_DIR/config/tmp_genesis.json && mv $HOME_DIR/config/tmp_genesis.json $HOME_DIR/config/genesis.json
@@ -98,11 +96,12 @@ from_scratch () {
9896
update_test_genesis '.app_state["tokenfactory"]["params"]["denom_creation_fee"]=[]'
9997
update_test_genesis '.app_state["tokenfactory"]["params"]["denom_creation_gas_consume"]=100000'
10098

101-
BINARY keys list --keyring-backend $KEYRING
99+
$BINARY keys list --keyring-backend $KEYRING --home $HOME_DIR
102100

103101
# Allocate genesis accounts
104-
BINARY genesis add-genesis-account $KEY 10000000$DENOM,900test --keyring-backend $KEYRING --append
105-
BINARY genesis add-genesis-account $KEY2 10000000$DENOM,800test --keyring-backend $KEYRING --append
102+
BASE_GENESIS_ALLOCATIONS="100000000000000000000000000$DENOM,100000000test"
103+
$BINARY genesis add-genesis-account $KEY $BASE_GENESIS_ALLOCATIONS --keyring-backend $KEYRING --append --home $HOME_DIR
104+
$BINARY genesis add-genesis-account $KEY2 $BASE_GENESIS_ALLOCATIONS --keyring-backend $KEYRING --append --home $HOME_DIR
106105

107106
# ICS provider genesis hack
108107
HACK_DIR=icshack-1 && echo $HACK_DIR
@@ -150,4 +149,4 @@ sed -i -e 's/address = ":8080"/address = "0.0.0.0:'$ROSETTA'"/g' $HOME_DIR/confi
150149
sed -i -e 's/timeout_commit = "5s"/timeout_commit = "'$BLOCK_TIME'"/g' $HOME_DIR/config/config.toml
151150

152151
# Start the daemon in the background
153-
BINARY start --pruning=nothing --minimum-gas-prices=0$DENOM --rpc.laddr="tcp://0.0.0.0:$RPC"
152+
$BINARY start --pruning=nothing --minimum-gas-prices=0$DENOM --rpc.laddr="tcp://0.0.0.0:$RPC" --home $HOME_DIR

‎simapp/scripts/test_node.sh‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ if [ -z `which $BINARY` ]; then
3838
fi
3939
fi
4040

41-
alias BINARY="$BINARY --home=$HOME_DIR"
42-
4341
command -v $BINARY > /dev/null 2>&1 || { echo >&2 "$BINARY command not found. Ensure this is setup / properly installed in your GOPATH (make install)."; exit 1; }
4442
command -v jq > /dev/null 2>&1 || { echo >&2 "jq not installed. More info: https://stedolan.github.io/jq/download/"; exit 1; }
4543

@@ -67,15 +65,15 @@ from_scratch () {
6765
add_key() {
6866
key=$1
6967
mnemonic=$2
70-
echo $mnemonic | BINARY keys add $key --keyring-backend $KEYRING --algo $KEYALGO --recover
68+
echo $mnemonic | $BINARY keys add $key --keyring-backend $KEYRING --algo $KEYALGO --home $HOME_DIR --recover
7169
}
7270

7371
# wasm1efd63aw40lxf3n4mhf7dzhjkr453axursysrvp
7472
add_key $KEY "decorate bright ozone fork gallery riot bus exhaust worth way bone indoor calm squirrel merry zero scheme cotton until shop any excess stage laundry"
7573
# wasm1hj5fveer5cjtn4wd6wstzugjfdxzl0xpvsr89g
7674
add_key $KEY2 "wealth flavor believe regret funny network recall kiss grape useless pepper cram hint member few certain unveil rather brick bargain curious require crowd raise"
7775

78-
BINARY init $MONIKER --chain-id $CHAIN_ID --default-denom $DENOM
76+
$BINARY init $MONIKER --chain-id $CHAIN_ID --default-denom $DENOM --home $HOME_DIR
7977

8078
update_test_genesis () {
8179
cat $HOME_DIR/config/genesis.json | jq "$1" > $HOME_DIR/config/tmp_genesis.json && mv $HOME_DIR/config/tmp_genesis.json $HOME_DIR/config/genesis.json
@@ -116,16 +114,19 @@ from_scratch () {
116114
update_test_genesis '.app_state["tokenfactory"]["params"]["denom_creation_fee"]=[]'
117115
update_test_genesis '.app_state["tokenfactory"]["params"]["denom_creation_gas_consume"]=100000'
118116

117+
118+
BASE_GENESIS_ALLOCATIONS="100000000000000000000000000$DENOM,100000000test"
119+
119120
# Allocate genesis accounts
120-
BINARY genesis add-genesis-account $KEY 100000000000000000000000000$DENOM,100000000test --keyring-backend $KEYRING --append
121-
BINARY genesis add-genesis-account $KEY2 100000000000000000000000000$DENOM,90000000test --keyring-backend $KEYRING --append
121+
$BINARY genesis add-genesis-account $KEY $BASE_GENESIS_ALLOCATIONS --keyring-backend $KEYRING --home $HOME_DIR --append
122+
$BINARY genesis add-genesis-account $KEY2 $BASE_GENESIS_ALLOCATIONS --keyring-backend $KEYRING --home $HOME_DIR --append
122123

123124
# Sign genesis transaction
124-
BINARY genesis gentx $KEY 1000000000000000000000$DENOM --gas-prices 0${DENOM} --keyring-backend $KEYRING --chain-id $CHAIN_ID
125+
$BINARY genesis gentx $KEY 1000000000000000000000$DENOM --gas-prices 0${DENOM} --keyring-backend $KEYRING --chain-id $CHAIN_ID --home $HOME_DIR
125126

126-
BINARY genesis collect-gentxs
127+
$BINARY genesis collect-gentxs --home $HOME_DIR
127128

128-
BINARY genesis validate-genesis
129+
$BINARY genesis validate-genesis --home $HOME_DIR
129130
err=$?
130131
if [ $err -ne 0 ]; then
131132
echo "Failed to validate genesis"
@@ -164,4 +165,4 @@ sed -i -e 's/address = ":8080"/address = "0.0.0.0:'$ROSETTA'"/g' $HOME_DIR/confi
164165
# Faster blocks
165166
sed -i -e 's/timeout_commit = "5s"/timeout_commit = "'$BLOCK_TIME'"/g' $HOME_DIR/config/config.toml
166167

167-
BINARY start --pruning=nothing --minimum-gas-prices=0$DENOM --rpc.laddr="tcp://0.0.0.0:$RPC"
168+
$BINARY start --pruning=nothing --minimum-gas-prices=0$DENOM --rpc.laddr="tcp://0.0.0.0:$RPC" --home $HOME_DIR

‎spawn/file_content.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (fc *FileContent) ReplaceTestNodeScript(cfg *NewChainConfig) {
109109
fc.ReplaceAll(`wasm1hj5fveer5cjtn4wd6wstzugjfdxzl0xpvsr89g`, `wasm1r6yue0vuyj9m7xw78npspt9drq2tmtvgdttkxx`)
110110

111111
// the same for both ics & normal test nodes
112-
baseStartCmd := `BINARY start --pruning=nothing --minimum-gas-prices=0$DENOM --rpc.laddr="tcp://0.0.0.0:$RPC"`
112+
baseStartCmd := `$BINARY start --pruning=nothing --minimum-gas-prices=0$DENOM --rpc.laddr="tcp://0.0.0.0:$RPC" --home $HOME_DIR`
113113
fc.ReplaceAll(baseStartCmd, fmt.Sprintf(`%s --json-rpc.api=eth,txpool,personal,net,debug,web3 --chain-id="$CHAIN_ID"`, baseStartCmd))
114114
}
115115

0 commit comments

Comments
 (0)