Fix gomocks (#3606)

This was broken with the monolith service commit: #3590
scionproto · Jan 14, 2020 · ea5caf5 · ea5caf5
1 parent 1352c6c
commit ea5caf5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 19 deletions.
diff --git a/go/cs/beacon/mock_beacon/beacon.go b/go/cs/beacon/mock_beacon/beacon.go
diff --git a/go/cs/beaconing/mock_beaconing/beaconing.go b/go/cs/beaconing/mock_beaconing/beaconing.go
diff --git a/go/cs/keepalive/mock_keepalive/keepalive.go b/go/cs/keepalive/mock_keepalive/keepalive.go
diff --git a/go/cs/revocation/mock_revocation/revocation.go b/go/cs/revocation/mock_revocation/revocation.go
diff --git a/go/cs/segreq/mock_segreq/segreq.go b/go/cs/segreq/mock_segreq/segreq.go
diff --git a/go/cs/segutil/mock_segutil/segutil.go b/go/cs/segutil/mock_segutil/segutil.go
diff --git a/tools/gomocks b/tools/gomocks
@@ -32,11 +32,13 @@ STD_LIB_MOCKS_DIRECTORY = os.path.join("go", "lib", "mocks")
 
 MOCK_TARGETS = [
         ("net", "Addr,Conn,PacketConn"),
-        (SCION_PACKAGE_PREFIX + "/go/beacon_srv/internal/beacon", "DB,Transaction"),
-        (SCION_PACKAGE_PREFIX + "/go/beacon_srv/internal/beaconing",
+        (SCION_PACKAGE_PREFIX + "/go/cs/beacon", "DB,Transaction"),
+        (SCION_PACKAGE_PREFIX + "/go/cs/beaconing",
             "BeaconInserter,BeaconProvider,SegmentProvider"),
-        (SCION_PACKAGE_PREFIX + "/go/beacon_srv/internal/keepalive", "IfStatePusher,RevDropper"),
-        (SCION_PACKAGE_PREFIX + "/go/beacon_srv/internal/revocation", "Store"),
+        (SCION_PACKAGE_PREFIX + "/go/cs/keepalive", "IfStatePusher,RevDropper"),
+        (SCION_PACKAGE_PREFIX + "/go/cs/revocation", "Store"),
+        (SCION_PACKAGE_PREFIX + "/go/cs/segreq", "LocalInfo"),
+        (SCION_PACKAGE_PREFIX + "/go/cs/segutil", "Policy"),
         (SCION_PACKAGE_PREFIX + "/go/hidden_path_srv/internal/registration", "Validator"),
         (SCION_PACKAGE_PREFIX + "/go/hidden_path_srv/internal/hpsegreq", "Fetcher"),
         (SCION_PACKAGE_PREFIX + "/go/lib/ctrl/seg", "Signer"),
@@ -64,8 +66,6 @@ MOCK_TARGETS = [
         (SCION_PACKAGE_PREFIX + "/go/lib/topology", "Topology"),
         (SCION_PACKAGE_PREFIX + "/go/lib/periodic/internal/metrics", "ExportMetric"),
         (SCION_PACKAGE_PREFIX + "/go/lib/xtest", "Callback"),
-        (SCION_PACKAGE_PREFIX + "/go/path_srv/internal/segreq", "LocalInfo"),
-        (SCION_PACKAGE_PREFIX + "/go/path_srv/internal/segutil", "Policy"),
         (SCION_PACKAGE_PREFIX + "/go/sciond/internal/fetcher", "Policy"),
         (SCION_PACKAGE_PREFIX + "/go/sig/internal/pathmgr", "Policy,Querier,Resolver"),
         (SCION_PACKAGE_PREFIX + "/go/sig/egress/iface", "Session"),