Use TW_IoTeX_Proto_SigningOutput for IoTeX (#436)

* Update TWIoTeXSigner.h * Return TW_IoTeX_Proto_SigningOutput and add Swift test case * Update IoTeXTests.swift
trustwallet · May 17, 2019 · ebe041f · ebe041f
1 parent bdc7fb9
commit ebe041f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 23 deletions.
diff --git a/include/TrustWalletCore/TWIoTeXSigner.h b/include/TrustWalletCore/TWIoTeXSigner.h
@@ -19,6 +19,6 @@ struct TWIoTeXSigner;
 
 /// Signs a transaction.
 TW_EXPORT_STATIC_METHOD
-TW_Proto_Result TWIoTeXSignerSign(TW_IoTeX_Proto_SigningInput input);
+TW_IoTeX_Proto_SigningOutput TWIoTeXSignerSign(TW_IoTeX_Proto_SigningInput input);
 
 TW_EXTERN_C_END
diff --git a/src/interface/TWIoTeXSigner.cpp b/src/interface/TWIoTeXSigner.cpp
@@ -12,30 +12,13 @@
 
 using namespace TW::IoTeX;
 
-static TW_Proto_Result createErrorResult(const std::string& description) {
-    auto result = TW::Proto::Result();
-    result.set_success(false);
-    result.set_error(description);
-    auto serialized = result.SerializeAsString();
-    return TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(serialized.data()), serialized.size());
-}
-
 TW_Proto_Result TWIoTeXSignerSign(TW_IoTeX_Proto_SigningInput data) {
     Proto::SigningInput input;
-    if (!input.ParseFromArray(TWDataBytes(data), static_cast<int>(TWDataSize(data)))) {
-        return createErrorResult("IoTeX: invalid input, please check IoTeX.proto file for correct msg format");
-    }
+    input.ParseFromArray(TWDataBytes(data), static_cast<int>(TWDataSize(data)));
 
-    try {
-        auto signer = new TWIoTeXSigner{ Signer(std::move(input)) };
-        Proto::SigningOutput output = signer->impl.build();
+    auto signer = new TWIoTeXSigner{ Signer(std::move(input)) };
+    Proto::SigningOutput output = signer->impl.build();
 
-        auto result = TW::Proto::Result();
-        result.set_success(true);
-        result.add_objects()->PackFrom(output);
-        auto serialized = result.SerializeAsString();
-        return TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(serialized.data()), serialized.size());
-    } catch (const std::exception& e) {
-        return createErrorResult(e.what());
-    }
+    auto serialized = output.SerializeAsString();
+    return TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(serialized.data()), serialized.size());
 }
diff --git a/swift/Tests/Blockchains/IoTeXTests.swift b/swift/Tests/Blockchains/IoTeXTests.swift
@@ -0,0 +1,31 @@
+// Copyright © 2017-2019 Trust.
+//
+// This file is part of Trust. The full Trust copyright notice, including
+// terms governing use, modification, and redistribution, is contained in the
+// file LICENSE at the root of the source code distribution tree.
+
+import XCTest
+import TrustWalletCore
+
+class IoTeXTests: XCTestCase {
+
+    func testSign() {
+        let privateKey = PrivateKey(data: Data(hexString: "0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748")!)!
+
+        let input = IoTeXSigningInput.with {
+            $0.version = 1
+            $0.nonce = 1
+            $0.gasLimit = 1
+            $0.gasPrice = "1"
+            $0.transfer = TW_IoTeX_Proto_Transfer.with {
+                $0.amount = "1"
+                $0.recipient = IoTeXAddress(string: "io1e2nqsyt7fkpzs5x7zf2uk0jj72teu5n6aku3tr")!.description
+            }
+            $0.privateKey = privateKey.data
+        }
+
+        let encoded = IoTeXSigner.sign(input: input).encoded
+
+        XCTAssertEqual(encoded.hexString, "0a39080110011801220131522e0a01311229696f3165326e7173797437666b707a733578377a6632756b306a6a3732746575356e36616b75337472124104fb30b196ce3e976593ecc2da220dca9cdea8c84d2373770042a930b892ac0f5cf762f20459c9100eb9d4d7597f5817bf21e10b53a0120b9ec1ba5cddfdcb669b1a41ec9757ae6c9009315830faaab250b6db0e9535b00843277f596ae0b2b9efc0bd4e14138c056fc4cdfa285d13dd618052b3d1cb7a3f554722005a2941bfede96601");
+    }
+}