Merge remote-tracking branch 'origin/master' into new-sdk

zmh0531 · Jul 31, 2018 · 47fea36 · 47fea36
2 parents 6939b9a + 9457f5b
commit 47fea36
Show file tree

Hide file tree

Showing 30 changed files with 206 additions and 41 deletions.
diff --git a/acceptance/indy-cli-batches/AS-01-01-general-1.batch b/acceptance/indy-cli-batches/AS-01-01-general-1.batch
@@ -1,7 +1,7 @@
 #setup environment
 - pool create AS-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-pool
-wallet create AS-01-wallet-1 pool_name=AS-pool key=testkey
+wallet create AS-01-wallet-1 key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-01-wallet-1 key=testkey
 #check that general actions work
 did new seed=000000000000000000000000Trustee1 metadata="default trustee"
@@ -13,7 +13,7 @@ did rotate-key
 ledger nym did=NyLkggDnCtZY6ngkfNqzg2 verkey=~LTar8Y3uzcQEt3HdhgqtSz
 - ledger get-nym did=NyLkggDnCtZY6ngkfNqzg2
 did list
-wallet create AS-01-identity-wallet pool_name=AS-pool key=testkey
+wallet create AS-01-identity-wallet key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-01-identity-wallet key=testkey
 did new seed=00000000000000000000000Identity1 metadata="new identity"
 did use NyLkggDnCtZY6ngkfNqzg2

diff --git a/acceptance/indy-cli-batches/AS-01-01-general-2.batch b/acceptance/indy-cli-batches/AS-01-01-general-2.batch
@@ -1,7 +1,7 @@
 #setup environment
 - pool create AS-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-pool
-wallet create AS-01-wallet-2 pool_name=AS-pool key=testkey
+wallet create AS-01-wallet-2 key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-01-wallet-2 key=testkey
 #check that general actions work
 did new seed=000000000000000000000000Trustee1 metadata="default trustee"
@@ -13,7 +13,7 @@ did rotate-key
 ledger nym did=TLvnGKZVC3qkiZgn56esFG verkey=~YXLYfwoWJ8utAU8TBSmgn4
 - ledger get-nym did=TLvnGKZVC3qkiZgn56esFG
 did list
-wallet create AS-01-identity-wallet-2 pool_name=AS-pool key=testkey
+wallet create AS-01-identity-wallet-2 key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-01-identity-wallet-2 key=testkey
 did new seed=00000000000000000000000Identity2 metadata="new identity"
 did use TLvnGKZVC3qkiZgn56esFG

diff --git a/acceptance/indy-cli-batches/AS-01-01-general-3.batch b/acceptance/indy-cli-batches/AS-01-01-general-3.batch
@@ -1,7 +1,7 @@
 #setup environment
 - pool create AS-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-pool
-wallet create AS-01-wallet-3 pool_name=AS-pool key=testkey
+wallet create AS-01-wallet-3 key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-01-wallet-3 key=testkey
 #check that general actions work
 did new seed=000000000000000000000000Trustee1 metadata="default trustee"
@@ -13,7 +13,7 @@ did rotate-key
 ledger nym did=Qb7oAFvnr2kH6FeCA9UxUN verkey=~MBMEpUF1DPd6CM2irHVyXi
 - ledger get-nym did=Qb7oAFvnr2kH6FeCA9UxUN
 did list
-wallet create AS-01-identity-wallet-3 pool_name=AS-pool key=testkey
+wallet create AS-01-identity-wallet-3 key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-01-identity-wallet-3 key=testkey
 did new seed=00000000000000000000000Identity3 metadata="new identity"
 did use Qb7oAFvnr2kH6FeCA9UxUN

diff --git a/acceptance/indy-cli-batches/AS-01-02-before-migration-1.batch b/acceptance/indy-cli-batches/AS-01-02-before-migration-1.batch
@@ -1,14 +1,14 @@
 #prepare test IDs and wallets before client migration
 pool create AS-01-02-trustee-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-trustee-pool
-wallet create AS-01-02-trustee-wallet pool_name=AS-01-02-trustee-pool key=testkey
+wallet create AS-01-02-trustee-wallet key=testkey storage_config={"pool":"AS-01-02-trustee-pool"}
 wallet open AS-01-02-trustee-wallet key=testkey
 did new seed=000000000000000000000000Trustee1 metadata="default trustee"
 did use V4SGRU86Z58d6TV7PBUe6f
 ledger nym did=Mzcs3aMUHRQQwnW9bSdFgW verkey=~VkaLiUxDhNHN4sS3LGxbCP role=STEWARD
 pool create AS-01-02-steward-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-steward-pool
-wallet create AS-01-02-steward-wallet pool_name=AS-01-02-steward-pool key=testkey
+wallet create AS-01-02-steward-wallet key=testkey storage_config={"pool":"AS-01-02-steward-pool"}
 wallet open AS-01-02-steward-wallet key=testkey
 did new seed=0000000000000000000NewSteward121 metadata="new steward1"
 did use Mzcs3aMUHRQQwnW9bSdFgW

diff --git a/acceptance/indy-cli-batches/AS-01-02-before-migration-2.batch b/acceptance/indy-cli-batches/AS-01-02-before-migration-2.batch
@@ -1,14 +1,14 @@
 #prepare test IDs and wallets before client migration
 pool create AS-01-02-trustee-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-trustee-pool
-wallet create AS-01-02-trustee-wallet pool_name=AS-01-02-trustee-pool key=testkey
+wallet create AS-01-02-trustee-wallet key=testkey storage_config={"pool":"AS-01-02-trustee-pool"}
 wallet open AS-01-02-trustee-wallet key=testkey
 did new seed=000000000000000000000000Trustee1 metadata="default trustee"
 did use V4SGRU86Z58d6TV7PBUe6f
 ledger nym did=UAPL7pTFdHGCXS4MGU8Zqv verkey=~6m1fM2eoZ1ygsXgq8NLPGc role=STEWARD
 pool create AS-01-02-steward-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-steward-pool
-wallet create AS-01-02-steward-wallet pool_name=AS-01-02-steward-pool key=testkey
+wallet create AS-01-02-steward-wallet key=testkey storage_config={"pool":"AS-01-02-steward-pool"}
 wallet open AS-01-02-steward-wallet key=testkey
 did new seed=0000000000000000000NewSteward122 metadata="new steward2"
 did use UAPL7pTFdHGCXS4MGU8Zqv

diff --git a/acceptance/indy-cli-batches/AS-01-02-before-migration-3.batch b/acceptance/indy-cli-batches/AS-01-02-before-migration-3.batch
@@ -1,14 +1,14 @@
 #prepare test IDs and wallets before client migration
 pool create AS-01-02-trustee-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-trustee-pool
-wallet create AS-01-02-trustee-wallet pool_name=AS-01-02-trustee-pool key=testkey
+wallet create AS-01-02-trustee-wallet key=testkey storage_config={"pool":"AS-01-02-trustee-pool"}
 wallet open AS-01-02-trustee-wallet key=testkey
 did new seed=000000000000000000000000Trustee1 metadata="default trustee"
 did use V4SGRU86Z58d6TV7PBUe6f
 ledger nym did=Q4sXZA2FF8ePpnCbaWiNGP verkey=~RiX2km3TqJwmVNXj8WwcM6 role=STEWARD
 pool create AS-01-02-steward-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-steward-pool
-wallet create AS-01-02-steward-wallet pool_name=AS-01-02-steward-pool key=testkey
+wallet create AS-01-02-steward-wallet key=testkey storage_config={"pool":"AS-01-02-steward-pool"}
 wallet open AS-01-02-steward-wallet key=testkey
 did new seed=0000000000000000000NewSteward123 metadata="new steward3"
 did use Q4sXZA2FF8ePpnCbaWiNGP

diff --git a/acceptance/indy-cli-batches/AS-02-01-invalid-cases.batch b/acceptance/indy-cli-batches/AS-02-01-invalid-cases.batch
@@ -1,7 +1,7 @@
 #setup environment
 - pool create AS-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-pool
-- wallet create AS-02-wallet pool_name=AS-pool key=testkey
+- wallet create AS-02-wallet key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-02-wallet key=testkey
 #add node as TRUSTEE (FAIL)
 did use V4SGRU86Z58d6TV7PBUe6f

diff --git a/acceptance/indy-cli-batches/AS-02-01-prepare-DIDs.batch b/acceptance/indy-cli-batches/AS-02-01-prepare-DIDs.batch
@@ -1,7 +1,7 @@
 #setup environment
 - pool create AS-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-pool
-- wallet create AS-02-wallet pool_name=AS-pool key=testkey
+- wallet create AS-02-wallet key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-02-wallet key=testkey
 #additg test DIDs with different roles for roles adding
 did new seed=StewardNode500000000000000000000 metadata="node5 steward"

diff --git a/acceptance/indy-cli-batches/AS-02-02-invalid-cases.batch b/acceptance/indy-cli-batches/AS-02-02-invalid-cases.batch
@@ -1,7 +1,7 @@
 #setup environment
 - pool create AS-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-pool
-- wallet create AS-02-wallet pool_name=AS-pool key=testkey
+- wallet create AS-02-wallet key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-02-wallet key=testkey
 #node adding invalid cases:
 #demote node as STEWARD of ANOTHER node (FAIL)

diff --git a/acceptance/indy-cli-batches/AS-03-01-identity-owner.batch b/acceptance/indy-cli-batches/AS-03-01-identity-owner.batch
@@ -1,7 +1,7 @@
 # setup environment
 - pool create AS-0301-owner gen_txn_file=./pool_transactions_genesis
 pool connect AS-0301-owner
-- wallet create AS-03-wallet-owner pool_name=AS-0301-owner key=testkey
+- wallet create AS-03-wallet-owner key=testkey storage_config={"pool":"AS-0301-owner"}
 wallet open AS-03-wallet-owner key=testkey
 # setup section
 did new seed=000000000000000000000000Trustee1 metadata="Default Trustee"

diff --git a/acceptance/indy-cli-batches/AS-03-01-steward.batch b/acceptance/indy-cli-batches/AS-03-01-steward.batch
@@ -1,7 +1,7 @@
 # setup environment
 - pool create AS-0301-steward gen_txn_file=./pool_transactions_genesis
 pool connect AS-0301-steward
-- wallet create AS-03-wallet-steward pool_name=AS-0301-steward key=testkey
+- wallet create AS-03-wallet-steward key=testkey storage_config={"pool":"AS-0301-steward"}
 wallet open AS-03-wallet-steward key=testkey
 # setup section
 did new seed=TestTrustee100000000000000000001 metadata="test trustee 1"

diff --git a/acceptance/indy-cli-batches/AS-03-01-trust-anchor.batch b/acceptance/indy-cli-batches/AS-03-01-trust-anchor.batch
@@ -1,7 +1,7 @@
 # setup environment
 - pool create AS-0301-anchor gen_txn_file=./pool_transactions_genesis
 pool connect AS-0301-anchor
-- wallet create AS-03-wallet-anchor pool_name=AS-0301-anchor key=testkey
+- wallet create AS-03-wallet-anchor key=testkey storage_config={"pool":"AS-0301-anchor"}
 wallet open AS-03-wallet-anchor key=testkey
 # setup section
 did new seed=000000000000000000000000Trustee1 metadata="Default Trustee"

diff --git a/acceptance/indy-cli-batches/AS-03-01-trustee.batch b/acceptance/indy-cli-batches/AS-03-01-trustee.batch
@@ -1,7 +1,7 @@
 # setup environment
 - pool create AS-0301-trustee gen_txn_file=./pool_transactions_genesis
 pool connect AS-0301-trustee
-- wallet create AS-03-wallet-trustee pool_name=AS-0301-trustee key=testkey
+- wallet create AS-03-wallet-trustee key=testkey storage_config={"pool":"AS-0301-trustee"}
 wallet open AS-03-wallet-trustee key=testkey
 # setup section
 did new seed=TestTrustee100000000000000000000 metadata="test trustee 1"

diff --git a/acceptance/indy-cli-batches/AS-04-02-before-upgrade.batch b/acceptance/indy-cli-batches/AS-04-02-before-upgrade.batch
@@ -1,7 +1,7 @@
 #setup environment
 - pool create AS-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-pool
-wallet create AS-04-wallet pool_name=AS-pool key=testkey
+wallet create AS-04-wallet key=testkey storage_config={"pool":"AS-pool"}
 wallet open AS-04-wallet key=testkey
 did new seed=000000000000000000000000Trustee1 metadata="default trustee"
 did use V4SGRU86Z58d6TV7PBUe6f

diff --git a/acceptance/indy-cli-batches/expected/AS-01-01-general-1.expected b/acceptance/indy-cli-batches/expected/AS-01-01-general-1.expected
@@ -4,7 +4,7 @@
 pool connect AS-pool
 [1;32mPool "AS-pool" has been connected[0m
 
-wallet create AS-01-wallet-1 pool_name=AS-pool key=testkey
+wallet create AS-01-wallet-1 key=testkey storage_config={"pool":"AS-pool"}
 [1;32mWallet "AS-01-wallet-1" has been created[0m
 
 wallet open AS-01-wallet-1 key=testkey
@@ -82,7 +82,7 @@ did list
 +------------------------+----------------------------------------------+-----------------+
 [1;32mCurrent did "5Ur5boqV3EXobXhtfow83q"[0m
 
-wallet create AS-01-identity-wallet pool_name=AS-pool key=testkey
+wallet create AS-01-identity-wallet key=testkey storage_config={"pool":"AS-pool"}
 [1;32mWallet "AS-01-identity-wallet" has been created[0m
 
 wallet open AS-01-identity-wallet key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-01-01-general-2.expected b/acceptance/indy-cli-batches/expected/AS-01-01-general-2.expected
@@ -4,7 +4,7 @@
 pool connect AS-pool
 [1;32mPool "AS-pool" has been connected[0m
 
-wallet create AS-01-wallet-2 pool_name=AS-pool key=testkey
+wallet create AS-01-wallet-2 key=testkey storage_config={"pool":"AS-pool"}
 [1;32mWallet "AS-01-wallet-2" has been created[0m
 
 wallet open AS-01-wallet-2 key=testkey
@@ -82,7 +82,7 @@ did list
 +------------------------+----------------------------------------------+-----------------+
 [1;32mCurrent did "L8voaFcbR8oAJu9mKHxuYr"[0m
 
-wallet create AS-01-identity-wallet-2 pool_name=AS-pool key=testkey
+wallet create AS-01-identity-wallet-2 key=testkey storage_config={"pool":"AS-pool"}
 [1;32mWallet "AS-01-identity-wallet-2" has been created[0m
 
 wallet open AS-01-identity-wallet-2 key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-01-01-general-3.expected b/acceptance/indy-cli-batches/expected/AS-01-01-general-3.expected
@@ -4,7 +4,7 @@
 pool connect AS-pool
 [1;32mPool "AS-pool" has been connected[0m
 
-wallet create AS-01-wallet-3 pool_name=AS-pool key=testkey
+wallet create AS-01-wallet-3 key=testkey storage_config={"pool":"AS-pool"}
 [1;32mWallet "AS-01-wallet-3" has been created[0m
 
 wallet open AS-01-wallet-3 key=testkey
@@ -82,7 +82,7 @@ did list
 +------------------------+----------------------------------------------+-----------------+
 [1;32mCurrent did "Dji7gLeU11xUrHxZQVmScq"[0m
 
-wallet create AS-01-identity-wallet-3 pool_name=AS-pool key=testkey
+wallet create AS-01-identity-wallet-3 key=testkey storage_config={"pool":"AS-pool"}
 [1;32mWallet "AS-01-identity-wallet-3" has been created[0m
 
 wallet open AS-01-identity-wallet-3 key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-01-02-before-migration-1.expected b/acceptance/indy-cli-batches/expected/AS-01-02-before-migration-1.expected
@@ -4,7 +4,7 @@ pool create AS-01-02-trustee-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-trustee-pool
 [1;32mPool "AS-01-02-trustee-pool" has been connected[0m
 
-wallet create AS-01-02-trustee-wallet pool_name=AS-01-02-trustee-pool key=testkey
+wallet create AS-01-02-trustee-wallet key=testkey storage_config={"pool":"AS-01-02-trustee-pool"}
 [1;32mWallet "AS-01-02-trustee-wallet" has been created[0m
 
 wallet open AS-01-02-trustee-wallet key=testkey
@@ -39,7 +39,7 @@ pool connect AS-01-02-steward-pool
 [1;32mPool "AS-01-02-trustee-pool" has been disconnected[0m
 [1;32mPool "AS-01-02-steward-pool" has been connected[0m
 
-wallet create AS-01-02-steward-wallet pool_name=AS-01-02-steward-pool key=testkey
+wallet create AS-01-02-steward-wallet key=testkey storage_config={"pool":"AS-01-02-steward-pool"}
 [1;32mWallet "AS-01-02-steward-wallet" has been created[0m
 
 wallet open AS-01-02-steward-wallet key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-01-02-before-migration-2.expected b/acceptance/indy-cli-batches/expected/AS-01-02-before-migration-2.expected
@@ -4,7 +4,7 @@ pool create AS-01-02-trustee-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-trustee-pool
 [1;32mPool "AS-01-02-trustee-pool" has been connected[0m
 
-wallet create AS-01-02-trustee-wallet pool_name=AS-01-02-trustee-pool key=testkey
+wallet create AS-01-02-trustee-wallet key=testkey storage_config={"pool":"AS-01-02-trustee-pool"}
 [1;32mWallet "AS-01-02-trustee-wallet" has been created[0m
 
 wallet open AS-01-02-trustee-wallet key=testkey
@@ -39,7 +39,7 @@ pool connect AS-01-02-steward-pool
 [1;32mPool "AS-01-02-trustee-pool" has been disconnected[0m
 [1;32mPool "AS-01-02-steward-pool" has been connected[0m
 
-wallet create AS-01-02-steward-wallet pool_name=AS-01-02-steward-pool key=testkey
+wallet create AS-01-02-steward-wallet key=testkey storage_config={"pool":"AS-01-02-steward-pool"}
 [1;32mWallet "AS-01-02-steward-wallet" has been created[0m
 
 wallet open AS-01-02-steward-wallet key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-01-02-before-migration-3.expected b/acceptance/indy-cli-batches/expected/AS-01-02-before-migration-3.expected
@@ -4,7 +4,7 @@ pool create AS-01-02-trustee-pool gen_txn_file=./pool_transactions_genesis
 pool connect AS-01-02-trustee-pool
 [1;32mPool "AS-01-02-trustee-pool" has been connected[0m
 
-wallet create AS-01-02-trustee-wallet pool_name=AS-01-02-trustee-pool key=testkey
+wallet create AS-01-02-trustee-wallet key=testkey storage_config={"pool":"AS-01-02-trustee-pool"}
 [1;32mWallet "AS-01-02-trustee-wallet" has been created[0m
 
 wallet open AS-01-02-trustee-wallet key=testkey
@@ -39,7 +39,7 @@ pool connect AS-01-02-steward-pool
 [1;32mPool "AS-01-02-trustee-pool" has been disconnected[0m
 [1;32mPool "AS-01-02-steward-pool" has been connected[0m
 
-wallet create AS-01-02-steward-wallet pool_name=AS-01-02-steward-pool key=testkey
+wallet create AS-01-02-steward-wallet key=testkey storage_config={"pool":"AS-01-02-steward-pool"}
 [1;32mWallet "AS-01-02-steward-wallet" has been created[0m
 
 wallet open AS-01-02-steward-wallet key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-02-01-invalid-cases.expected b/acceptance/indy-cli-batches/expected/AS-02-01-invalid-cases.expected
@@ -4,7 +4,7 @@
 pool connect AS-pool
 [1;32mPool "AS-pool" has been connected[0m
 
-- wallet create AS-02-wallet pool_name=AS-pool key=testkey
+- wallet create AS-02-wallet key=testkey storage_config={"pool":"AS-pool"}
 [1;31mWallet "AS-02-wallet" already exists[0m
 
 wallet open AS-02-wallet key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-02-01-prepare-DIDs.expected b/acceptance/indy-cli-batches/expected/AS-02-01-prepare-DIDs.expected
@@ -4,7 +4,7 @@
 pool connect AS-pool
 [1;32mPool "AS-pool" has been connected[0m
 
-- wallet create AS-02-wallet pool_name=AS-pool key=testkey
+- wallet create AS-02-wallet key=testkey storage_config={"pool":"AS-pool"}
 [1;31mWallet "AS-02-wallet" already exists[0m
 
 wallet open AS-02-wallet key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-02-02-invalid-cases.expected b/acceptance/indy-cli-batches/expected/AS-02-02-invalid-cases.expected
@@ -4,7 +4,7 @@
 pool connect AS-pool
 [1;32mPool "AS-pool" has been connected[0m
 
-- wallet create AS-02-wallet pool_name=AS-pool key=testkey
+- wallet create AS-02-wallet key=testkey storage_config={"pool":"AS-pool"}
 [1;31mWallet "AS-02-wallet" already exists[0m
 
 wallet open AS-02-wallet key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-03-01-identity-owner.expected b/acceptance/indy-cli-batches/expected/AS-03-01-identity-owner.expected
@@ -4,7 +4,7 @@
 pool connect AS-0301-owner
 [1;32mPool "AS-0301-owner" has been connected[0m
 
-- wallet create AS-03-wallet-owner pool_name=AS-0301-owner key=testkey
+- wallet create AS-03-wallet-owner key=testkey storage_config={"pool":"AS-0301-owner"}
 [1;32mWallet "AS-03-wallet-owner" has been created[0m
 
 wallet open AS-03-wallet-owner key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-03-01-steward.expected b/acceptance/indy-cli-batches/expected/AS-03-01-steward.expected
@@ -4,7 +4,7 @@
 pool connect AS-0301-steward
 [1;32mPool "AS-0301-steward" has been connected[0m
 
-- wallet create AS-03-wallet-steward pool_name=AS-0301-steward key=testkey
+- wallet create AS-03-wallet-steward key=testkey storage_config={"pool":"AS-0301-steward"}
 [1;32mWallet "AS-03-wallet-steward" has been created[0m
 
 wallet open AS-03-wallet-steward key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-03-01-trust-anchor.expected b/acceptance/indy-cli-batches/expected/AS-03-01-trust-anchor.expected
@@ -4,7 +4,7 @@
 pool connect AS-0301-anchor
 [1;32mPool "AS-0301-anchor" has been connected[0m
 
-- wallet create AS-03-wallet-anchor pool_name=AS-0301-anchor key=testkey
+- wallet create AS-03-wallet-anchor key=testkey storage_config={"pool":"AS-0301-anchor"}
 [1;32mWallet "AS-03-wallet-anchor" has been created[0m
 
 wallet open AS-03-wallet-anchor key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-03-01-trustee.expected b/acceptance/indy-cli-batches/expected/AS-03-01-trustee.expected
@@ -4,7 +4,7 @@
 pool connect AS-0301-trustee
 [1;32mPool "AS-0301-trustee" has been connected[0m
 
-- wallet create AS-03-wallet-trustee pool_name=AS-0301-trustee key=testkey
+- wallet create AS-03-wallet-trustee key=testkey storage_config={"pool":"AS-0301-trustee"}
 [1;32mWallet "AS-03-wallet-trustee" has been created[0m
 
 wallet open AS-03-wallet-trustee key=testkey

diff --git a/acceptance/indy-cli-batches/expected/AS-04-02-before-upgrade.expected b/acceptance/indy-cli-batches/expected/AS-04-02-before-upgrade.expected
@@ -4,7 +4,7 @@
 pool connect AS-pool
 [1;32mPool "AS-pool" has been connected[0m
 
-wallet create AS-04-wallet pool_name=AS-pool key=testkey
+wallet create AS-04-wallet key=testkey storage_config={"pool":"AS-pool"}
 [1;32mWallet "AS-04-wallet" has been created[0m
 
 wallet open AS-04-wallet key=testkey