Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

[DEVOPS-1046] Use new internal/import-wallet endpoint #3594

Merged
merged 2 commits into from
Sep 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions scripts/launch/demo-cluster/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,14 @@ in pkgs.writeScript "demo-cluster" ''
for i in {0..${builtins.toString numImportedWallets}}
do
echo "Importing key$i.sk ..."
curl https://${demoWallet.walletListen}/api/wallets/keys \
curl https://${demoWallet.walletListen}/api/internal/import-wallet \
--cacert ${stateDir}/tls/client/ca.crt \
--cert ${stateDir}/tls/client/client.pem \
-X POST \
-H 'cache-control: no-cache' \
-H 'content-type: application/json' \
-d "\"${stateDir}/genesis-keys/generated-keys/poor/key$i.sk\"" | jq .
-H 'Content-Type: application/json; charset=utf-8' \
-H 'Accept: application/json; charset=utf-8' \
-d "{\"filePath\": \"${stateDir}/genesis-keys/generated-keys/poor/key$i.sk\"}" | jq .
done
fi
''}
Expand Down
2 changes: 1 addition & 1 deletion wallet-new/integration/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ genesisAssetLockedWallet wc = do
where isLockedGenesisWallet w = isGenesisWallet w && isLockedWallet w

isGenesisWallet :: Wallet -> Bool
isGenesisWallet = (== "Genesis wallet") . walName
isGenesisWallet = (== "Imported Wallet") . walName

lockedWallet :: WalletId
lockedWallet =
Expand Down