add TransactionHash

Author: tempofeng

etherspace-java/src/main/java/cc/etherspace/EtherSpace.kt

@@ -4,6 +4,7 @@ import cc.etherspace.calladapter.CallAdapter
 import cc.etherspace.calladapter.PassThroughCallAdaptor
 import cc.etherspace.web3j.Web3jAdapter
 import com.google.common.reflect.TypeToken
+import kotlinx.coroutines.experimental.runBlocking
 import okhttp3.OkHttpClient
 import java.io.IOException
 import java.lang.Thread.sleep
@@ -72,7 +73,7 @@ class EtherSpace(val web3: Web3,
                         gasPrice = it.gasPrice.toBigInteger())
             } ?: defaultOptions
 
-    @Throws(IOException::class)
+    @Throws(IOException::class, TransactionFailedException::class)
     private fun invokeTransactionFunction(toAddress: String,
                                           functionName: String,
                                           args: List<Any>,
@@ -91,17 +92,15 @@ class EtherSpace(val web3: Web3,
                 nonce)
         val transactionHash = web3.eth.sendTransaction(transactionObject, cd)
         val returnTypeToken = TypeToken.of(returnType)
-        when {
-            returnTypeToken.isSubtypeOf(String::class.java) -> return transactionHash
+        return when {
+            returnTypeToken.isSubtypeOf(String::class.java) -> transactionHash
             returnTypeToken.isSubtypeOf(TransactionReceipt::class.java) -> {
-                for (i in 1..GET_TRANSACTION_RECEIPT_POLLING_ATTEMPTS) {
-                    val transactionReceipt = web3.eth.getTransactionReceipt(transactionHash)
-                    if (transactionReceipt != null) {
-                        return transactionReceipt
-                    }
-                    sleep(GET_TRANSACTION_RECEIPT_POLLING_INTERVAL_IN_MS)
+                runBlocking {
+                    TransactionHash(web3, transactionHash).requestTransactionReceipt()
                 }
-                throw IOException("Unable to get transaction receipt because of timeout.")
+            }
+            returnTypeToken.isSubtypeOf(TransactionHash::class.java) -> {
+                TransactionHash(web3, transactionHash)
             }
             else -> throw IllegalArgumentException("Unknown return type:${returnType.typeName}")
         }
@@ -160,7 +159,7 @@ class EtherSpace(val web3: Web3,
 
     companion object {
         inline fun build(block: Builder.() -> Unit) = Builder().apply(block).build()
-        private const val GET_TRANSACTION_RECEIPT_POLLING_INTERVAL_IN_MS = 5_000L
-        private const val GET_TRANSACTION_RECEIPT_POLLING_ATTEMPTS = 60
+        internal const val GET_TRANSACTION_RECEIPT_POLLING_INTERVAL_IN_MS = 5_000L
+        internal const val GET_TRANSACTION_RECEIPT_POLLING_ATTEMPTS = 60
     }
 }

etherspace-java/src/main/java/cc/etherspace/TransactionFailedException.kt

@@ -0,0 +1,5 @@
+package cc.etherspace
+
+import java.io.IOException
+
+class TransactionFailedException(val transactionReceipt: TransactionReceipt) : IOException()

etherspace-java/src/main/java/cc/etherspace/TransactionHash.kt

@@ -0,0 +1,20 @@
+package cc.etherspace
+
+import cc.etherspace.EtherSpace.Companion.GET_TRANSACTION_RECEIPT_POLLING_ATTEMPTS
+import kotlinx.coroutines.experimental.delay
+import java.io.IOException
+
+data class TransactionHash(private val web3: Web3,
+                           val hash: String) {
+    suspend fun requestTransactionReceipt(): TransactionReceipt {
+        for (i in 1..EtherSpace.GET_TRANSACTION_RECEIPT_POLLING_ATTEMPTS) {
+            val transactionReceipt = web3.eth.getTransactionReceipt(hash)
+            if (transactionReceipt != null) {
+                if (!transactionReceipt.success) throw TransactionFailedException(transactionReceipt)
+                return transactionReceipt
+            }
+            delay(GET_TRANSACTION_RECEIPT_POLLING_ATTEMPTS)
+        }
+        throw IOException("transactionTimeout:transactionHash=$this")
+    }
+}

etherspace-java/src/test/java/cc/etherspace/Greeter.kt

@@ -12,6 +12,10 @@ interface Greeter {
     @Send(functionName = "newGreeting")
     fun newGreeting_functionName(greeting: String): TransactionReceipt
 
+    @Throws(IOException::class)
+    @Send
+    fun newGreeting_transactionHash(greeting: String): TransactionHash
+
     @Throws(IOException::class)
     @Send
     fun newGreeting(greeting: String, options: Options): String

etherspace-java/src/test/java/cc/etherspace/GreeterTest.kt

@@ -2,8 +2,8 @@ package cc.etherspace
 
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
-import org.amshove.kluent.`should be greater than`
 import org.amshove.kluent.`should be equal to`
+import org.amshove.kluent.`should be greater than`
 import org.amshove.kluent.`should equal`
 import org.junit.Before
 import org.junit.Test
@@ -73,6 +73,12 @@ class GreeterTest {
         transactionHash.length.`should be equal to`(66)
     }
 
+    @Test
+    fun newGreeting_transactionHash() {
+        val transactionHash = greeter.newGreeting_transactionHash("Hello World")
+        transactionHash.hash.length.`should be equal to`(66)
+    }
+
     @Test
     fun greet() {
         val greet = greeter.greet()