Uncomment NFT wallet functional test

Author: OBorce

Diff for: test/functional/test_framework/wallet_cli_controller.py

@@ -192,7 +192,7 @@ async def unmint_tokens(self, token_id: str, amount: int) -> str:
         return await self._write_command(f"unminttokens {token_id} {amount}\n")
 
     async def lock_token_suply(self, token_id: str) -> str:
-        return await self._write_command(f"locktokensuply {token_id}\n")
+        return await self._write_command(f"locktokensupply {token_id}\n")
 
     async def issue_new_nft(self,
                             destination_address: str,

Diff for: test/functional/wallet_nfts.py

@@ -119,27 +119,25 @@ async def async_test(self):
             assert_in("Success", await wallet.sync())
 
 
-            # TODO: add support for tokens v1
-            # See https://github.com/mintlayer/mintlayer-core/issues/1237
-            #self.log.info(await wallet.get_balance())
-            #assert_in(f"{nft_id} amount: 1", await wallet.get_balance())
-
-            ## create a new account and send some tokens to it
-            #await wallet.create_new_account()
-            #await wallet.select_account(1)
-            #address = await wallet.new_address()
-
-            #await wallet.select_account(0)
-            #assert_in(f"{nft_id} amount: 1", await wallet.get_balance())
-            #output = await wallet.send_tokens_to_address(nft_id, address, 1)
-            #self.log.info(output)
-            #assert_in("The transaction was submitted successfully", output)
-
-            #self.generate_block()
-            #assert_in("Success", await wallet.sync())
-
-            ## check the new balance nft is not present
-            #assert nft_id not in await wallet.get_balance()
+            self.log.info(await wallet.get_balance())
+            assert_in(f"{nft_id} amount: 1", await wallet.get_balance())
+
+            # create a new account and send some tokens to it
+            await wallet.create_new_account()
+            await wallet.select_account(1)
+            address = await wallet.new_address()
+
+            await wallet.select_account(0)
+            assert_in(f"{nft_id} amount: 1", await wallet.get_balance())
+            output = await wallet.send_tokens_to_address(nft_id, address, 1)
+            self.log.info(output)
+            assert_in("The transaction was submitted successfully", output)
+
+            self.generate_block()
+            assert_in("Success", await wallet.sync())
+
+            # check the new balance nft is not present
+            assert nft_id not in await wallet.get_balance()
 
 if __name__ == '__main__':
     WalletNfts().main()

Diff for: test/functional/wallet_tokens_change_supply.py

@@ -58,7 +58,7 @@ def generate_block(self):
         block_input_data = block_input_data_obj.encode(block_input_data).to_hex()[2:]
 
         # create a new block, taking transactions from mempool
-        block = node.blockprod_generate_block(block_input_data, None)
+        block = node.blockprod_generate_block(block_input_data, [], [], "FillSpaceFromMempool")
         node.chainstate_submit_block(block)
         block_id = node.chainstate_best_block_id()
 

Diff for: wallet/src/wallet/tests.rs

@@ -2309,7 +2309,7 @@ fn issue_and_transfer_tokens(#[case] seed: Seed) {
 #[case(Seed::from_entropy())]
 fn check_tokens_v0_are_ignored(#[case] seed: Seed) {
     let mut rng = make_seedable_rng(seed);
-    let chain_config = Arc::new(create_mainnet());
+    let chain_config = Arc::new(create_regtest());
 
     let mut wallet = create_wallet(chain_config.clone());
 

Diff for: wallet/wallet-cli-lib/src/commands/mod.rs

@@ -220,7 +220,7 @@ pub enum WalletCommand {
     },
 
     /// Lock the circulating supply for the token
-    LockTokenSuply {
+    LockTokenSupply {
         token_id: String,
     },
 
@@ -889,7 +889,7 @@ impl CommandHandler {
                 Ok(Self::tx_submitted_command())
             }
 
-            WalletCommand::LockTokenSuply { token_id } => {
+            WalletCommand::LockTokenSupply { token_id } => {
                 let token_id = parse_token_id(chain_config, token_id.as_str())?;
 
                 self.get_synced_controller()