Fix merge conflict

CHANGELOG.rst

@@ -7,6 +7,7 @@ All notable changes to this project are documented in this file.
 -----------------------
 - add ``ServiceEnabled`` boolean to settings to determine whether nodes should send other nodes blocks
 - updated new block retrieval mechanism
+- fix for token_delete command not removing tokens from wallet file
 - fixed sc-events and notification DB showing previous block height instead of final block height of event
 - persist refund() notify events in notification DB
 

neo/Implementations/Wallets/peewee/UserWallet.py

@@ -480,16 +480,17 @@ def PubKeys(self):
 
         return jsn
 
-    def DeleteNEP5Token(self, token):
+    def DeleteNEP5Token(self, script_hash):
 
-        success = super(UserWallet, self).DeleteNEP5Token(token)
+        token = super(UserWallet, self).DeleteNEP5Token(script_hash)
 
         try:
             db_token = NEP5Token.get(ContractHash=token.ScriptHash.ToBytes())
             db_token.delete_instance()
         except Exception as e:
-            pass
-        return success
+            return False
+
+        return True
 
     def DeleteAddress(self, script_hash):
         success, coins_toremove = super(UserWallet, self).DeleteAddress(script_hash)

neo/Implementations/Wallets/peewee/test_user_wallet.py

@@ -150,8 +150,16 @@ def test_7_import_token(self):
 
         wallet.AddNEP5Token(token)
 
+        wallet = self.GetWallet1(recreate=True)  # re-open wallet
+
         self.assertEqual(len(wallet.GetTokens()), 1)
 
+        wallet.DeleteNEP5Token(token.ScriptHash)
+
+        wallet = self.GetWallet1(recreate=True)  # re-open wallet
+
+        self.assertEqual(len(wallet.GetTokens()), 0)
+
     def test_8_named_addr(self):
 
         wallet = self.GetWallet1()

neo/Wallets/Wallet.py

@@ -199,7 +199,7 @@ def DeleteNEP5Token(self, script_hash):
             token (UInt160): Token Contract script hash
 
         Returns:
-            bool: success status.
+            NEP5Token: the token object removed from the wallet
         """
         return self._tokens.pop(script_hash.ToBytes())