Fix wallet update labels, disable heavy benchmark in unit tests

goatpig · May 25, 2022 · c12846e · c12846e
1 parent a7d4bc7
commit c12846e
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 59 deletions.
diff --git a/armoryengine/CppBridge.py b/armoryengine/CppBridge.py
@@ -1186,6 +1186,17 @@ def setComment(self, wltId, key, val):
 
       self.sendToBridgeProto(packet, False)
 
+   #############################################################################
+   def setWalletLabels(self, wltId, title, desc):
+      packet = ClientProto_pb2.ClientCommand()
+      packet.method = ClientProto_pb2.setWalletLabels
+
+      packet.stringArgs.append(wltId)
+      packet.stringArgs.append(title)
+      packet.stringArgs.append(desc)
+
+      self.sendToBridgeProto(packet, False)
+
    #############################################################################
    def estimateFee(self, blocks, strat):
       packet = ClientProto_pb2.ClientCommand()

diff --git a/armoryengine/PyBtcWallet.py b/armoryengine/PyBtcWallet.py
@@ -1168,12 +1168,9 @@ def getCommentForLE(self, le):
    def setWalletLabels(self, lshort, llong=''):
       self.labelName = lshort
       self.labelDescr = llong
-      toWriteS = lshort.ljust( 32, '\x00')
-      toWriteL =  llong.ljust(256, '\x00')
 
-      updList = []
-      updList.append([WLT_UPDATE_MODIFY, self.offsetLabelName,  toWriteS])
-      updList.append([WLT_UPDATE_MODIFY, self.offsetLabelDescr, toWriteL])
+      TheBridge.setWalletLabels(self.uniqueIDB58,
+         self.labelName, self.labelDescr)
 
    #############################################################################
    def deleteImportedAddress(self, addr160):

diff --git a/cppForSwig/BridgeAPI/CppBridge.cpp b/cppForSwig/BridgeAPI/CppBridge.cpp
@@ -1547,6 +1547,23 @@ void CppBridge::setComment(const ClientCommand& msg)
    wltContainer->setComment(hashKey, comment);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void CppBridge::setWalletLabels(const ClientCommand& msg)
+{
+   if (msg.stringargs_size() < 1 || msg.stringargs_size() > 3)
+      throw runtime_error("invalid command: setWalletLabels");
+
+   const auto& walletId = msg.stringargs(0);
+
+   auto wai = WalletAccountIdentifier::deserialize(walletId);
+   auto wltContainer = wltManager_->getWalletContainer(
+      wai.walletId, wai.accountId);
+
+   const auto& title = msg.stringargs(1);
+   const auto& desc = msg.stringargs(2);
+   wltContainer->setLabels(title, desc);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void CppBridge::getUtxosForValue(const string& id,
    uint64_t value, unsigned msgId)

diff --git a/cppForSwig/BridgeAPI/CppBridge.h b/cppForSwig/BridgeAPI/CppBridge.h
@@ -201,6 +201,7 @@ namespace Armory
             std::vector<std::string>, unsigned);
          void createAddressBook(const std::string&, unsigned);
          void setComment(const Codec_ClientProto::ClientCommand&);
+         void setWalletLabels(const Codec_ClientProto::ClientCommand&);
 
          //txs & headers
          void getTxByHash(const BinaryData&, unsigned);

diff --git a/cppForSwig/BridgeAPI/ProtobufCommandParser.cpp b/cppForSwig/BridgeAPI/ProtobufCommandParser.cpp
@@ -497,6 +497,12 @@ bool ProtobufCommandParser::processData(
       break;
    }
 
+   case Methods::setWalletLabels:
+   {
+      bridge->setWalletLabels(msg);
+      break;
+   }
+
    case Methods::getUtxosForValue:
    {
       if (msg.stringargs_size() != 1 || msg.longargs_size() != 1)

diff --git a/cppForSwig/BridgeAPI/WalletManager.cpp b/cppForSwig/BridgeAPI/WalletManager.cpp
@@ -668,6 +668,14 @@ void WalletContainer::setComment(const string& key, const string& val)
    wallet_->setComment(keyBd, val);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void WalletContainer::setLabels(const string& title, const string& desc)
+{
+   wallet_->setLabel(title);
+   wallet_->setDescription(desc);
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 ////
 //// Armory135Header

diff --git a/cppForSwig/BridgeAPI/WalletManager.h b/cppForSwig/BridgeAPI/WalletManager.h
@@ -217,6 +217,7 @@ class WalletContainer
    Armory::Backups::WalletBackup getBackupStrings(const PassphraseLambda&) const;
 
    void setComment(const std::string&, const std::string&);
+   void setLabels(const std::string&, const std::string&);
 };
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/cppForSwig/gtest/UtilsTests.cpp b/cppForSwig/gtest/UtilsTests.cpp
@@ -2014,7 +2014,7 @@ TEST_F(BinaryDataTest, Contains)
    EXPECT_FALSE(bd4_.contains(d, 8));
 }
 
-TEST_F(BinaryDataTest, CompareBench)
+TEST_F(BinaryDataTest, DISABLED_CompareBench)
 {
    auto start = chrono::system_clock::now();
 

diff --git a/cppForSwig/protobuf/ClientProto.proto b/cppForSwig/protobuf/ClientProto.proto
@@ -29,6 +29,7 @@ enum Methods
     getHeaderByHeight = 71;
     createAddressBook = 72;
     setComment = 73;
+    setWalletLabels = 74;
 
     getNewAddress = 80;
     getChangeAddress = 81;

diff --git a/qtdialogs/DlgWalletDetails.py b/qtdialogs/DlgWalletDetails.py
@@ -12,9 +12,9 @@
 
 from PySide2.QtCore import Qt, QByteArray
 from PySide2.QtWidgets import QFrame, QVBoxLayout, QGridLayout, QPushButton, \
-   QTreeView, QLabel, QCheckBox, QLineEdit, QDialogButtonBox
+   QTreeView, QLabel, QCheckBox, QLineEdit, QDialogButtonBox, QTextEdit
 
-from armoryengine.ArmoryUtils import getVersionString, coin2str
+from armoryengine.ArmoryUtils import getVersionString, coin2str, isASCII
 from armoryengine.BDM import TheBDM, BDM_UNINITIALIZED, BDM_OFFLINE, \
    BDM_SCANNING
 from armorycolors import htmlColor
@@ -23,7 +23,8 @@
 from qtdialogs.qtdefines import USERMODE, determineWalletType, \
    relaxedSizeNChar, relaxedSizeStr, QLabelButton, STYLE_SUNKEN, STYLE_NONE, \
    QRichLabel, makeHorizFrame, restoreTableView, WLTTYPES, \
-   WLTFIELDS, tightSizeStr, saveTableView
+   WLTFIELDS, tightSizeStr, saveTableView, tightSizeNChar, \
+   UnicodeErrorBox
 
 from qtdialogs.ArmoryDialog import ArmoryDialog
 from qtdialogs.MsgBoxWithDNAA import MsgBoxWithDNAA
@@ -1003,4 +1004,53 @@ def __init__(self, wltID, parent=None, main=None):
          bbox.rejected.connect(self.reject)
          layout.addWidget(bbox, 4, 0)
          self.setLayout(layout)
-         self.setWindowTitle(self.tr('Set Wallet Owner'))
+         self.setWindowTitle(self.tr('Set Wallet Owner'))
+
+################################################################################
+class DlgChangeLabels(ArmoryDialog):
+   def __init__(self, currName='', currDescr='', parent=None, main=None):
+      super(DlgChangeLabels, self).__init__(parent, main)
+
+      self.edtName = QLineEdit()
+      self.edtName.setMaxLength(32)
+      lblName = QLabel(self.tr("Wallet &name:"))
+      lblName.setBuddy(self.edtName)
+
+      self.edtDescr = QTextEdit()
+      tightHeight = tightSizeNChar(self.edtDescr, 1)[1]
+      self.edtDescr.setMaximumHeight(tightHeight * 4.2)
+      lblDescr = QLabel(self.tr("Wallet &description:"))
+      lblDescr.setAlignment(Qt.AlignVCenter)
+      lblDescr.setBuddy(self.edtDescr)
+
+      self.edtName.setText(currName)
+      self.edtDescr.setText(currDescr)
+
+      buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | \
+                                   QDialogButtonBox.Cancel)
+      buttonBox.accepted.connect(self.accept)
+      buttonBox.rejected.connect(self.reject)
+
+      layout = QGridLayout()
+      layout.addWidget(lblName, 1, 0, 1, 1)
+      layout.addWidget(self.edtName, 1, 1, 1, 1)
+      layout.addWidget(lblDescr, 2, 0, 1, 1)
+      layout.addWidget(self.edtDescr, 2, 1, 2, 1)
+      layout.addWidget(buttonBox, 4, 0, 1, 2)
+      self.setLayout(layout)
+
+      self.setWindowTitle(self.tr('Wallet Descriptions'))
+
+
+   def accept(self, *args):
+      try:
+         self.edtName.text().encode("ascii")
+      except UnicodeDecodeError:
+         UnicodeErrorBox(self)
+         return
+
+      if len(str(self.edtName.text()).strip()) == 0:
+         QMessageBox.critical(self, self.tr('Empty Name'), \
+            self.tr('All wallets must have a name. '), QMessageBox.Ok)
+         return
+      super(DlgChangeLabels, self).accept(*args)
diff --git a/qtdialogs/qtdialogs.py b/qtdialogs/qtdialogs.py
@@ -555,55 +555,6 @@ def getImportWltPath(self):
       if self.importFile:
          self.accept()
 
-
-################################################################################
-class DlgChangeLabels(ArmoryDialog):
-   def __init__(self, currName='', currDescr='', parent=None, main=None):
-      super(DlgChangeLabels, self).__init__(parent, main)
-
-      self.edtName = QLineEdit()
-      self.edtName.setMaxLength(32)
-      lblName = QLabel(self.tr("Wallet &name:"))
-      lblName.setBuddy(self.edtName)
-
-      self.edtDescr = QTextEdit()
-      tightHeight = tightSizeNChar(self.edtDescr, 1)[1]
-      self.edtDescr.setMaximumHeight(tightHeight * 4.2)
-      lblDescr = QLabel(self.tr("Wallet &description:"))
-      lblDescr.setAlignment(Qt.AlignVCenter)
-      lblDescr.setBuddy(self.edtDescr)
-
-      self.edtName.setText(currName)
-      self.edtDescr.setText(currDescr)
-
-      buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | \
-                                   QDialogButtonBox.Cancel)
-      self.connect(buttonBox, SIGNAL('accepted()'), self.accept)
-      self.connect(buttonBox, SIGNAL('rejected()'), self.reject)
-
-      layout = QGridLayout()
-      layout.addWidget(lblName, 1, 0, 1, 1)
-      layout.addWidget(self.edtName, 1, 1, 1, 1)
-      layout.addWidget(lblDescr, 2, 0, 1, 1)
-      layout.addWidget(self.edtDescr, 2, 1, 2, 1)
-      layout.addWidget(buttonBox, 4, 0, 1, 2)
-      self.setLayout(layout)
-
-      self.setWindowTitle(self.tr('Wallet Descriptions'))
-
-
-   def accept(self, *args):
-      if not isASCII(unicode(self.edtName.text())) or \
-         not isASCII(unicode(self.edtDescr.toPlainText())):
-         UnicodeErrorBox(self)
-         return
-
-      if len(str(self.edtName.text()).strip()) == 0:
-         QMessageBox.critical(self, self.tr('Empty Name'), \
-            self.tr('All wallets must have a name. '), QMessageBox.Ok)
-         return
-      super(DlgChangeLabels, self).accept(*args)
-
 ################################################################################
 class LoadingDisp(ArmoryDialog):
    def __init__(self, parent, main):