From 2c2c7db9813266d5f808bdd1cf0ad3f32bd31ad7 Mon Sep 17 00:00:00 2001
From: yosoyubik <yosoyubik@gmail.com>
Date: Tue, 22 Jun 2021 15:00:24 +0200
Subject: [PATCH] naive: get point data from aggregator

---
 pkg/arvo/app/aggregator.hoon  |  7 +++++++
 pkg/arvo/app/azimuth-rpc.hoon |  4 ++--
 pkg/arvo/app/azimuth.hoon     | 12 ++----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkg/arvo/app/aggregator.hoon b/pkg/arvo/app/aggregator.hoon
index 55f699747b..7cb902d0a7 100644
--- a/pkg/arvo/app/aggregator.hoon
+++ b/pkg/arvo/app/aggregator.hoon
@@ -151,6 +151,7 @@
       [%x %nonce @ @ ~]     (nonce i.t.t.path i.t.t.t.path)
       [%x %spawned @ ~]     (spawned i.t.t.path)
       [%x %next-batch ~]    ``noun+!>(next-batch)
+      [%x %point @ ~]       (point i.t.t.path)
     ==
     ::
     ++  pending-by
@@ -230,6 +231,12 @@
       ^-  [=^ship =address:ethereum]
       :-  ship
       address:(proxy-from-point:naive %own point)
+    ::
+    ++  point
+      |=  wat=@t
+      ?~  ship=(rush wat ;~(pfix sig fed:ag))
+        ``noun+!>(*(unit point:naive))
+      ``noun+!>((get:orm:naive points.pre u.ship))
     --
   ::
   ++  on-arvo
diff --git a/pkg/arvo/app/azimuth-rpc.hoon b/pkg/arvo/app/azimuth-rpc.hoon
index 2db0dbff70..3c55d93792 100644
--- a/pkg/arvo/app/azimuth-rpc.hoon
+++ b/pkg/arvo/app/azimuth-rpc.hoon
@@ -125,7 +125,7 @@
   =,  azimuth-rpc
   ?.  ?=([%map *] params)
     [~ ~(parse error:json-rpc id)]
-  ?+    method  [~ ~(method error:json-rpc id)]
+  ?+  method  [~ ~(method error:json-rpc id)]
     %get-point             [~ (get-point id +.params point:scry)]
     %transfer-point        (transfer-point id +.params)
     %cancel-tx             (cancel-tx id +.params)
@@ -155,7 +155,7 @@
     |=  =ship
     .^  (unit point:naive)
         %gx
-        (~(scry agentio bowl) %azimuth /nas/(scot %p ship)/noun)
+        (~(scry agentio bowl) %aggregator /point/(scot %p ship)/noun)
     ==
   ::
   ++  spawned
diff --git a/pkg/arvo/app/azimuth.hoon b/pkg/arvo/app/azimuth.hoon
index a8ebc7d8d1..b0987ddb09 100644
--- a/pkg/arvo/app/azimuth.hoon
+++ b/pkg/arvo/app/azimuth.hoon
@@ -288,16 +288,8 @@
   |=  =path
   ^-  (unit (unit cage))
   ?+  path  (on-peek:def path)
-      [%x %logs ~]
-    ``logs+!>(logs.state)
-  ::
-      [%x %nas ~]
-    ``nas+!>(nas.state)
-  ::
-      [%x %nas @t ~]
-    ?~  ship=(rush i.t.t.path ;~(pfix sig fed:ag))
-      ``noun+!>(*(unit point:naive))
-    ``noun+!>((~(get by points.nas.state) u.ship))
+      [%x %logs ~]  ``logs+!>(logs.state)
+      [%x %nas ~]   ``nas+!>(nas.state)
   ==
 ::
 ++  on-agent