Merge pull request #15 from AntonAndell/master

Apply changes from issue #14

Author: sink772

unittest/src/main/java/score/Context.java

@@ -95,7 +95,8 @@ public static Object call(BigInteger value,
 
     public static<T> T call(Class<T> cls,
                             Address targetAddress, String method, Object... params) {
-        return cls.cast(call(targetAddress, method, params));
+        var caller = stackWalker.getCallerClass();
+        return cls.cast(sm.call(caller, BigInteger.ZERO, targetAddress, method, params));
     }
 
     public static Object call(Address targetAddress, String method, Object... params) {

unittest/src/test/java/score/ContextTest.java

@@ -30,11 +30,13 @@
 class ContextTest extends TestBase {
     private static final ServiceManager sm = getServiceManager();
     private static final Account owner = sm.createAccount();
+    private static Score echoScore;
     private static Score helloScore;
 
     @BeforeEach
     void setUp() throws Exception {
-        helloScore = sm.deploy(owner, HelloWorld.class, "Alice");
+        echoScore = sm.deploy(owner, Echo.class);
+        helloScore = sm.deploy(owner, HelloWorld.class, "Alice", echoScore.getAddress());
     }
 
     @Test
@@ -61,4 +63,16 @@ void hash() {
         assertArrayEquals(Crypto.hash("sha3-256", data),
                 (byte[]) helloScore.call("computeHash", "sha3-256", data));
     }
+
+    @Test
+    void callCasted() {
+       String echoMessage = "test";
+       assertEquals(echoMessage, helloScore.call("castedEcho", echoMessage));
+    }
+
+    @Test
+    void callTyped() {
+        String echoMessage = "test";
+       assertEquals(echoMessage, helloScore.call("typedEcho", echoMessage));
+    }
 }

unittest/src/test/java/score/Echo.java

@@ -0,0 +1,12 @@
+package score;
+
+import java.lang.String;
+import score.annotation.External;
+
+public class Echo {
+
+  @External(readonly=true)
+  public String echo(String message) {
+    return message;
+  }
+}

unittest/src/test/java/score/HelloWorld.java

@@ -20,9 +20,11 @@
 
 public class HelloWorld {
     private final String name;
+    private final Address echoAddress;
 
-    public HelloWorld(String name) {
+    public HelloWorld(String name, Address echoAddress) {
         this.name = name;
+        this.echoAddress = echoAddress;
     }
 
     @External(readonly=true)
@@ -52,4 +54,14 @@ public byte[] computeHash(String algorithm, byte[] data) {
         }
         return null;
     }
+
+    @External(readonly=true)
+    public String castedEcho(String message) {
+        return (String) Context.call(echoAddress, "echo", message);
+    }
+
+    @External(readonly=true)
+    public String typedEcho(String message) {
+        return Context.call(String.class, echoAddress, "echo", message);
+    }
 }