bugfix/harden asset update

de-luxe · Oct 3, 2016 · 4845a18 · 4845a18
1 parent 9646c1b
commit 4845a18
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -95,7 +95,7 @@
             <configuration>
               <target>
                 <copy file="${project.basedir}/target/${project.build.finalName}.jar" tofile="${project.basedir}/dist/tmp/${project.build.finalName}.jar"/>
-                <copy file="${project.basedir}/observer.default.properties" tofile="${project.basedir}/dist/tmp/faucet.properties"/>
+                <copy file="${project.basedir}/observer.default.properties" tofile="${project.basedir}/dist/tmp/observer.properties"/>
                 <copy file="${project.basedir}/LICENSE.md" tofile="${project.basedir}/dist/tmp/LICENSE.txt"/>
                 <copy file="${project.basedir}/README.md" tofile="${project.basedir}/dist/tmp/README.txt"/>
                 <copy file="${project.basedir}/run.bat" tofile="${project.basedir}/dist/tmp/run.sh"/>

diff --git a/src/main/java/burstcoin/observer/service/AssetService.java b/src/main/java/burstcoin/observer/service/AssetService.java
@@ -146,7 +146,7 @@ public void run()
               assetBeans.add(new AssetBean(asset.getAsset(), asset.getName(), asset.getDescription(), asset.getAccountRS(), asset.getAccount(),
                                            asset.getQuantityQNT(), asset.getDecimals(), asset.getNumberOfAccounts(), asset.getNumberOfTransfers(),
                                            asset.getNumberOfTrades(), buyOrders.size(), sellOrders.size(),
-                                           formatAmountNQT(volume7Days, 8), formatAmountNQT(volume30Days, 8) , s));
+                                           formatAmountNQT(volume7Days, 8), formatAmountNQT(volume30Days, 8), s));
             }
           }
           Collections.sort(assetBeans, new Comparator<AssetBean>()
@@ -222,7 +222,7 @@ private Map<Asset, List<Trade>> getTradeLookup(Map<String, Asset> assetLookup)
 
   private boolean updateTradeLookup(Map<Asset, List<Trade>> tradeLookup, Map<String, Asset> assetLookup, int offset, int transactionsPerRequest)
   {
-    boolean hasMoreTrades = true;
+    boolean hasMoreTrades = false;
     try
     {
       InputStreamResponseListener listener = new InputStreamResponseListener();
@@ -242,9 +242,9 @@ private boolean updateTradeLookup(Map<Asset, List<Trade>> tradeLookup, Map<Strin
         try (InputStream responseContent = listener.getInputStream())
         {
           Trades trades = objectMapper.readValue(responseContent, Trades.class);
-          if(!trades.getTrades().isEmpty() && trades.getTrades().size() < transactionsPerRequest)
+          if(!trades.getTrades().isEmpty() && trades.getTrades().size() >= transactionsPerRequest)
           {
-            hasMoreTrades = false;
+            hasMoreTrades = true;
           }
 
           for(Trade trade : trades.getTrades())
@@ -284,17 +284,11 @@ private State getState()
       request.send(listener);
 
       Response response = listener.get(ObserverProperties.getConnectionTimeout(), TimeUnit.MILLISECONDS);
-
-      // Look at the response
       if(response.getStatus() == 200)
       {
-        // Use try-with-resources to close input stream.
         try (InputStream responseContent = listener.getInputStream())
         {
           state = objectMapper.readValue(responseContent, State.class);
-
-
-//          LOG.info("received '" + trades.getTrades().size() + "' trades in '" + trades.getRequestProcessingTime() + "' ms");
         }
         catch(Exception e)
         {