[resolves trustwallet#260] fix test, clean up code

include/TrustWalletCore/TWAeternitySigner.h

@@ -5,8 +5,6 @@
 // file LICENSE at the root of the source code distribution tree.
 #pragma once
 
-#include "TWBase.h"
-#include "TWData.h"
 #include "TWAeternityProto.h"
 
 TW_EXTERN_C_BEGIN

src/Aeternity/Address.h

@@ -39,7 +39,7 @@ inline bool operator==(const Address& lhs, const Address& rhs) {
 } // namespace TW::Aeternity
 
 
-/// Wrapper for C interface.
+// Wrapper for C interface.
 struct TWAeternityAddress {
     TW::Aeternity::Address impl;
 };

src/Aeternity/Transaction.h

@@ -1,3 +1,5 @@
+#include <utility>
+
 // Copyright © 2017-2019 Trust.
 //
 // This file is part of Trust. The full Trust copyright notice, including
@@ -16,35 +18,35 @@ class Transaction {
 
   public:
     /// sender address
-    std::string &sender_id;
+    std::string sender_id;
     /// recepient address
-    std::string &recipient_id;
+    std::string recipient_id;
 
     uint64_t amount;
 
     uint64_t fee;
 
     /// message
-    std::string &payload;
+    std::string payload;
 
     /// the block time that tx live on the mempool, you can use 0 by default, or >latest block
     uint64_t ttl;
     uint64_t nonce;
 
     Transaction(
-        std::string &sender_id,
-        std::string &recipientId,
+        std::string sender_id, //todo
+        std::string recipientId,
         uint64_t amount,
         uint64_t fee,
-        std::string &payload,
+        std::string payload,
         uint64_t ttl,
         uint64_t nonce
     )
-        : sender_id(sender_id)
-        , recipient_id(recipientId)
+        : sender_id(std::move(sender_id))
+        , recipient_id(std::move(recipientId))
         , amount(amount)
         , fee(fee)
-        , payload(payload)
+        , payload(std::move(payload))
         , ttl(ttl)
         , nonce(nonce){};
 

src/interface/TWAeternityAddress.cpp

@@ -42,12 +42,12 @@ struct TWAeternityAddress *_Nonnull TWAeternityAddressCreateWithPublicKey(struct
     return new TWAeternityAddress{ Address(publicKey->impl) };
 }
 
-void TWAeternityAddressDelete(struct TWAeternityAddress *_Nonnull address) {
-    delete address;
-}
-
 /// Returns the address string representation.
 TWString *_Nonnull TWAeternityAddressDescription(struct TWAeternityAddress *_Nonnull address){
     const auto string = address->impl.string();
     return TWStringCreateWithUTF8Bytes(string.c_str());
 }
+
+void TWAeternityAddressDelete(struct TWAeternityAddress *_Nonnull address) {
+    delete address;
+}

src/interface/TWAeternitySigner.cpp

@@ -4,13 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
-#include "../Aeternity/Address.h"
 #include "../Aeternity/Signer.h"
 #include "../Aeternity/Transaction.h"
 #include "../proto/Aeternity.pb.h"
-#include "../uint256.h"
 #include <TrustWalletCore/TWAeternitySigner.h>
-#include <boost/multiprecision/cpp_int.hpp>
 
 using namespace TW;
 using namespace TW::Aeternity;
@@ -21,28 +18,15 @@ TW_Aeternity_Proto_SigningOutput TWAeternitySignerSign(TW_Aeternity_Proto_Signin
 
     auto privateKey = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
 
-    auto from = Address(input.from_address());
-    auto to = Address(input.to_address());
-
-    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
-    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
-    uint64_t amount = 10;
-    double fee = 2e13;
-    std::string payload = "Hello World";
-    uint64_t ttl = 82757;
-    uint64_t nonce = 49;
-
-    auto tx = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
-
-//    auto tx = Transaction(
-//       from,
-//       to,
-//       input.amount(),
-//       input.fee(),
-//       input.payload(),
-//       input.ttl(),
-//       input.nonce()
-//    );
+    auto tx = Transaction(
+        input.from_address(),
+        input.to_address(),
+        input.amount(),
+        input.fee(),
+        input.payload(),
+        input.ttl(),
+        input.nonce()
+    );
 
     auto output = Signer::sign(privateKey, tx);