refactoring

Author: tempofeng

.gitignore

@@ -3,3 +3,4 @@
 /build/
 /local.properties
 *.DS_Store
+etherspace-java/contract/yarn.lock

etherspace-java/contract/contracts/Greeter.sol

@@ -7,10 +7,10 @@ contract mortal {
     address owner;
 
     /* this function is executed at initialization and sets the owner of the contract */
-    function mortal() { owner = msg.sender; }
+    function mortal() {owner = msg.sender;}
 
     /* Function to recover the funds on the contract */
-    function kill() { if (msg.sender == owner) suicide(owner); }
+    function kill() {if (msg.sender == owner) suicide(owner);}
 }
 
 contract greeter is mortal {
@@ -27,10 +27,6 @@ contract greeter is mortal {
         greeting = _greeting;
     }
 
-    function twoDimensionArray(uint[5][] array, uint row, uint col) constant returns (uint) {
-        return array[row][col];
-    }
-
     /* main function */
     function greet() constant returns (string) {
         return greeting;
@@ -39,8 +35,12 @@ contract greeter is mortal {
     /* we include indexed events to demonstrate the difference that can be
     captured versus non-indexed */
     event Modified(
-            string indexed oldGreetingIdx, string indexed newGreetingIdx,
-            string oldGreeting, string newGreeting);
+        string indexed oldGreetingIdx, string indexed newGreetingIdx,
+        string oldGreeting, string newGreeting);
+
+    function twoDimensionArray(uint[5][] array, uint row, uint col) constant returns (uint) {
+        return array[row][col];
+    }
 
     function boolType(bool a) constant returns (bool) {
         return a;

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

@@ -3,6 +3,7 @@ package cc.etherspace
 import cc.etherspace.calladapter.CallAdapter
 import cc.etherspace.calladapter.PassThroughCallAdaptor
 import cc.etherspace.web3j.Web3jAdapter
+import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import com.google.common.reflect.TypeToken
 import okhttp3.OkHttpClient
 import java.io.IOException

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

@@ -3,6 +3,7 @@ package cc.etherspace
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.amshove.kluent.`should be equal to`
+import org.amshove.kluent.`should be false`
 import org.amshove.kluent.`should be greater than`
 import org.amshove.kluent.`should equal`
 import org.junit.Before
@@ -13,6 +14,7 @@ import java.math.BigInteger
 
 class GreeterTest {
     private lateinit var greeter: Greeter
+    private lateinit var etherSpace: EtherSpace
 
     @Before
     fun setUp() {
@@ -22,14 +24,21 @@ class GreeterTest {
                 .addInterceptor(interceptor)
                 .build()
 
-        val etherSpace = EtherSpace.build {
+        etherSpace = EtherSpace.build {
             client = okHttpClient
             provider = "https://rinkeby.infura.io/"
             credentials = WalletCredentials(Tests.TEST_WALLET_KEY)
         }
         greeter = etherSpace.create(Tests.TEST_CONTRACT_ADDRESS, Greeter::class.java)
     }
 
+    @Test
+    fun wrongContract() {
+        val wrongGreeter = etherSpace.create("0xf9746f03bd6f29787994701996dffd7a1007f3a6", Greeter::class.java)
+        val receipt = wrongGreeter.newGreeting("Hello World")
+        receipt.success.`should be false`()
+    }
+
     @Test
     fun newGreeting() {
         val receipt = greeter.newGreeting("Hello World")

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

@@ -2,37 +2,32 @@ package cc.etherspace
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
 import org.amshove.kluent.`should be equal to`
+import org.amshove.kluent.`should be false`
 import org.amshove.kluent.`should be greater than`
 import org.amshove.kluent.`should equal`
 import org.junit.Before
 import org.junit.Test
 import org.web3j.utils.Numeric
-import java.io.File
 
 class LocalGreeterTest {
     private lateinit var greeter: Greeter
     private val objectMapper = jacksonObjectMapper()
+    private lateinit var etherSpace: EtherSpace
 
     @Before
     fun setUp() {
-        var contractAddress = objectMapper.readValue(File("build/contracts/greeter.json"),
-                ContractMetaData::class.java).networks.values.first().address
-
-        val interceptor = HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { message -> println(message) })
-        interceptor.level = HttpLoggingInterceptor.Level.BODY
-        val okHttpClient = OkHttpClient.Builder()
-                .addInterceptor(interceptor)
-                .build()
+        etherSpace = Tests.createEtherSpace()
+        greeter = Tests.createContract(etherSpace, Greeter::class.java, objectMapper)
+    }
 
-        val etherSpace = EtherSpace.build {
-            client = okHttpClient
-            credentials = WalletCredentials("0xc5aea8fb8b669d27da1c644064fb4cd80b7d3c9b7d2ebcab2bfade236834c784")
-        }
-        greeter = etherSpace.create(contractAddress, Greeter::class.java)
+    @Test(expected = MismatchedInputException::class)
+    fun wrongContract() {
+        val wrongGreeter = etherSpace.create("0xf9746f03bd6f29787994701996dffd7a1007f3a6", Greeter::class.java)
+        val receipt = wrongGreeter.newGreeting("Hello World")
+        receipt.success.`should be false`()
     }
 
     @Test

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

@@ -1,11 +1,40 @@
 package cc.etherspace
 
+import cc.etherspace.calladapter.CoroutineCallAdapter
+import com.fasterxml.jackson.databind.ObjectMapper
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import org.web3j.crypto.Keys
+import java.io.File
 
 object Tests {
     const val TEST_WALLET_KEY = "0xab1e199623aa5bb2c381c349b1734e31b5be08de0486ffab68e3af4853d9980b"
     @JvmField
     val TEST_WALLET_ADDRESS = Keys.toChecksumAddress("0x39759a3c0ada2d61b6ca8eb6afc8243075307ed3")!!
     @JvmField
     val TEST_CONTRACT_ADDRESS = Keys.toChecksumAddress("0xa871c507184ecfaf947253e187826c1907e8dc7d")!!
+
+    fun createEtherSpace(logLevel: HttpLoggingInterceptor.Level = HttpLoggingInterceptor.Level.NONE): EtherSpace {
+        val interceptor = HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { message -> println(message) })
+        interceptor.level = logLevel
+        val okHttpClient = OkHttpClient.Builder()
+                .addInterceptor(interceptor)
+                .build()
+
+        return EtherSpace.build {
+            client = okHttpClient
+            credentials = WalletCredentials("0xc5aea8fb8b669d27da1c644064fb4cd80b7d3c9b7d2ebcab2bfade236834c784")
+            callAdapters += CoroutineCallAdapter()
+        }
+    }
+
+    fun <T> createContract(etherSpace: EtherSpace, clazz: Class<T>, objectMapper: ObjectMapper): T {
+        val contractAddress = objectMapper.readValue(File("build/contracts/greeter.json"),
+                LocalGreeterTest.ContractMetaData::class.java).networks.values.first().address
+        return etherSpace.create(contractAddress, clazz)
+    }
+
+    fun <T> createContract(etherSpace: EtherSpace, clazz: Class<T>, contractAddress: String): T {
+        return etherSpace.create(contractAddress, clazz)
+    }
 }

etherspace-java/src/test/java/cc/etherspace/calladapter/CoroutineGreeterTest.kt

@@ -1,6 +1,7 @@
 package cc.etherspace.calladapter
 
 import cc.etherspace.*
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import kotlinx.coroutines.experimental.Deferred
 import kotlinx.coroutines.experimental.runBlocking
 import org.amshove.kluent.*
@@ -12,15 +13,22 @@ import java.math.BigInteger
 
 class CoroutineGreeterTest {
     private lateinit var greeter: CoroutineGreeter
+    private lateinit var etherSpace: EtherSpace
+    private val objectMapper = jacksonObjectMapper()
 
     @Before
     fun setUp() {
-        val etherSpace = EtherSpace.build {
-            provider = "https://rinkeby.infura.io/"
-            credentials = WalletCredentials(Tests.TEST_WALLET_KEY)
-            callAdapters += CoroutineCallAdapter()
+        etherSpace = Tests.createEtherSpace()
+        greeter = Tests.createContract(etherSpace, CoroutineGreeter::class.java, objectMapper)
+    }
+
+    @Test(expected = IOException::class)
+    fun wrongContract() {
+        runBlocking {
+            val wrongGreeter = etherSpace.create("0xf9746f03bd6f29787994701996dffd7a1007f3a6", CoroutineGreeter::class.java)
+            val receipt = wrongGreeter.newGreeting("Hello World").await()
+            receipt.success.`should be false`()
         }
-        greeter = etherSpace.create(Tests.TEST_CONTRACT_ADDRESS, CoroutineGreeter::class.java)
     }
 
     @Test
@@ -29,8 +37,6 @@ class CoroutineGreeterTest {
             val receipt = greeter.newGreeting("Hello World").await()
             receipt.blockHash.length.`should be equal to`(66)
             receipt.transactionHash.length.`should be equal to`(66)
-            receipt.from!!.`should be equal to`(Tests.TEST_WALLET_ADDRESS)
-            receipt.to!!.`should be equal to`(Tests.TEST_CONTRACT_ADDRESS)
             receipt.logs.size.`should be greater than`(0)
 
             val events = receipt.listEvents(CoroutineGreeter.Modified::class.java)
@@ -51,8 +57,6 @@ class CoroutineGreeterTest {
             val receipt = hash.requestTransactionReceipt<Deferred<TransactionReceipt>>().await()
             receipt.blockHash.length.`should be equal to`(66)
             receipt.transactionHash.length.`should be equal to`(66)
-            receipt.from!!.`should be equal to`(Tests.TEST_WALLET_ADDRESS)
-            receipt.to!!.`should be equal to`(Tests.TEST_CONTRACT_ADDRESS)
             receipt.logs.size.`should be greater than`(0)
         }
     }
@@ -73,7 +77,7 @@ class CoroutineGreeterTest {
         }
     }
 
-    @Test(expected = IllegalArgumentException::class)
+    @Test(expected = IOException::class)
     fun greet_wrongFunctionName() {
         runBlocking {
             val greet = greeter.greet_wrongFunctionName().await()