Check if target method is external

Author: sink772

unittest/src/main/java/com/iconloop/score/test/Score.java

@@ -17,6 +17,7 @@
 package com.iconloop.score.test;
 
 import score.Address;
+import score.annotation.External;
 import score.annotation.Optional;
 import score.UserRevertedException;
 
@@ -116,13 +117,12 @@ private Object[] convertParameters(Method method, Object[] params) {
 
     private Method getMethodByName(String name) throws NoSuchMethodException {
         Class<?> clazz = instance.getClass();
-        Method[] m = clazz.getMethods();
-        for (Method method : m) {
-            if (method.getName().equals(name)) {
-                return method;
+        Method[] methods = clazz.getMethods();
+        for (Method m : methods) {
+            if (m.getName().equals(name) && isExternal(m)) {
+                return m;
             }
         }
-
         throw new NoSuchMethodException();
     }
 
@@ -161,6 +161,10 @@ private Object getDefault(Class<?> type) {
         }
     }
 
+    private boolean isExternal(Method method) {
+        return method.getAnnotation(External.class) != null;
+    }
+
     private boolean isOptional(Parameter parameter) {
         return parameter.getAnnotation(Optional.class) != null;
     }

unittest/src/main/java/score/annotation/External.java

@@ -17,8 +17,11 @@
 package score.annotation;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface External {
     boolean readonly() default false;

unittest/src/test/java/score/CallTest.java

@@ -30,13 +30,18 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class CallTest extends TestBase {
     private static final ServiceManager sm = getServiceManager();
     private static final Account owner = sm.createAccount();
     private static Score echoScore;
 
     public static class Echo {
+        public int nonExternal() {
+            return 0;
+        }
+
         @External(readonly=true)
         public String echo(@Optional String message) {
             return message;
@@ -113,6 +118,12 @@ static void setUp() throws Exception {
         echoScore = sm.deploy(owner, Echo.class);
     }
 
+    @Test
+    void callNonExternal() {
+        assertThrows(RuntimeException.class, () ->
+                echoScore.call("nonExternal"));
+    }
+
     @Test
     void callCasted() {
         String echoMessage = "test";