Merge pull request #1257 from alon-e/bugfix/firstVM

GalRogozinski · web-flow · commit f735e7ce5626 · 2019-01-10T17:37:54.000+02:00
fix first() calls in view models
diff --git a/src/main/java/com/iota/iri/controllers/AddressViewModel.java b/src/main/java/com/iota/iri/controllers/AddressViewModel.java
@@ -1,5 +1,6 @@
 package com.iota.iri.controllers;
 
+import com.iota.iri.model.AddressHash;
 import com.iota.iri.model.Hash;
 import com.iota.iri.model.persistables.Address;
 import com.iota.iri.storage.Indexable;
@@ -59,7 +60,7 @@ public static AddressViewModel load(Tangle tangle, Indexable hash) throws Except
      * @throws Exception Thrown if the database fails to return a first object
      */
     public static AddressViewModel first(Tangle tangle) throws Exception {
-        Pair<Indexable, Persistable> bundlePair = tangle.getFirst(Address.class, Hash.class);
+        Pair<Indexable, Persistable> bundlePair = tangle.getFirst(Address.class, AddressHash.class);
         if(bundlePair != null && bundlePair.hi != null) {
             return new AddressViewModel((Address) bundlePair.hi, (Hash) bundlePair.low);
         }
diff --git a/src/main/java/com/iota/iri/controllers/ApproveeViewModel.java b/src/main/java/com/iota/iri/controllers/ApproveeViewModel.java
@@ -1,14 +1,13 @@
 package com.iota.iri.controllers;
 
 import com.iota.iri.model.Hash;
+import com.iota.iri.model.TransactionHash;
 import com.iota.iri.model.persistables.Approvee;
 import com.iota.iri.storage.Indexable;
 import com.iota.iri.storage.Persistable;
 import com.iota.iri.storage.Tangle;
 import com.iota.iri.utils.Pair;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -61,7 +60,7 @@ public static ApproveeViewModel load(Tangle tangle, Indexable hash) throws Excep
      * @throws Exception Thrown if the database fails to return a first object
      */
     public static ApproveeViewModel first(Tangle tangle) throws Exception {
-        Pair<Indexable, Persistable> bundlePair = tangle.getFirst(Approvee.class, Hash.class);
+        Pair<Indexable, Persistable> bundlePair = tangle.getFirst(Approvee.class, TransactionHash.class);
         if(bundlePair != null && bundlePair.hi != null) {
             return new ApproveeViewModel((Approvee) bundlePair.hi, (Hash) bundlePair.low);
         }
diff --git a/src/main/java/com/iota/iri/controllers/BundleViewModel.java b/src/main/java/com/iota/iri/controllers/BundleViewModel.java
@@ -1,14 +1,13 @@
 package com.iota.iri.controllers;
 
+import com.iota.iri.model.BundleHash;
 import com.iota.iri.model.Hash;
 import com.iota.iri.model.persistables.Bundle;
 import com.iota.iri.storage.Indexable;
 import com.iota.iri.storage.Persistable;
 import com.iota.iri.storage.Tangle;
 import com.iota.iri.utils.Pair;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -61,7 +60,7 @@ public static BundleViewModel load(Tangle tangle, Indexable hash) throws Excepti
      * @throws Exception Thrown if the database fails to return a first object
      */
     public static BundleViewModel first(Tangle tangle) throws Exception {
-        Pair<Indexable, Persistable> bundlePair = tangle.getFirst(Bundle.class, Hash.class);
+        Pair<Indexable, Persistable> bundlePair = tangle.getFirst(Bundle.class, BundleHash.class);
         if(bundlePair != null && bundlePair.hi != null) {
             return new BundleViewModel((Bundle) bundlePair.hi, (Hash) bundlePair.low);
         }
diff --git a/src/main/java/com/iota/iri/controllers/TagViewModel.java b/src/main/java/com/iota/iri/controllers/TagViewModel.java
@@ -1,15 +1,14 @@
 package com.iota.iri.controllers;
 
 import com.iota.iri.model.Hash;
+import com.iota.iri.model.TagHash;
 import com.iota.iri.model.persistables.ObsoleteTag;
 import com.iota.iri.model.persistables.Tag;
 import com.iota.iri.storage.Indexable;
 import com.iota.iri.storage.Persistable;
 import com.iota.iri.storage.Tangle;
 import com.iota.iri.utils.Pair;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -94,7 +93,7 @@ public static TagViewModel loadObsolete(Tangle tangle, Indexable hash) throws Ex
      * @throws Exception Thrown if the database fails to return a first object
      */
     public static TagViewModel first(Tangle tangle) throws Exception {
-        Pair<Indexable, Persistable> tagPair = tangle.getFirst(Tag.class, Hash.class);
+        Pair<Indexable, Persistable> tagPair = tangle.getFirst(Tag.class, TagHash.class);
         if(tagPair != null && tagPair.hi != null) {
             return new TagViewModel((Tag) tagPair.hi, (Hash) tagPair.low);
         }
diff --git a/src/main/java/com/iota/iri/controllers/TransactionViewModel.java b/src/main/java/com/iota/iri/controllers/TransactionViewModel.java
@@ -1,13 +1,8 @@
 package com.iota.iri.controllers;
 
 import com.iota.iri.model.*;
+import com.iota.iri.model.persistables.*;
 import com.iota.iri.service.snapshot.Snapshot;
-import com.iota.iri.model.persistables.Address;
-import com.iota.iri.model.persistables.Approvee;
-import com.iota.iri.model.persistables.Bundle;
-import com.iota.iri.model.persistables.ObsoleteTag;
-import com.iota.iri.model.persistables.Tag;
-import com.iota.iri.model.persistables.Transaction;
 import com.iota.iri.storage.Indexable;
 import com.iota.iri.storage.Persistable;
 import com.iota.iri.storage.Tangle;
@@ -246,7 +241,7 @@ public static Set<Indexable> getMissingTransactions(Tangle tangle) throws Except
      * @throws Exception Thrown if the database fails to return a first object.
      */
     public static TransactionViewModel first(Tangle tangle) throws Exception {
-        Pair<Indexable, Persistable> transactionPair = tangle.getFirst(Transaction.class, Hash.class);
+        Pair<Indexable, Persistable> transactionPair = tangle.getFirst(Transaction.class, TransactionHash.class);
         if (transactionPair != null && transactionPair.hi != null) {
             return new TransactionViewModel((Transaction) transactionPair.hi, (Hash) transactionPair.low);
         }
diff --git a/src/main/java/com/iota/iri/model/AbstractHash.java b/src/main/java/com/iota/iri/model/AbstractHash.java
@@ -1,22 +1,25 @@
 package com.iota.iri.model;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Objects;
-
 import com.iota.iri.crypto.Curl;
 import com.iota.iri.model.persistables.Transaction;
 import com.iota.iri.model.safe.ByteSafe;
 import com.iota.iri.model.safe.TritSafe;
 import com.iota.iri.storage.Indexable;
 import com.iota.iri.utils.Converter;
 
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Objects;
+
 public abstract class AbstractHash implements Hash, Serializable {
     private final Object lock = new Object();
 
     private ByteSafe byteSafe;
     private TritSafe tritSafe;
 
+    public AbstractHash() {
+    }
+
     public AbstractHash(byte[] source, int sourceOffset, int sourceSize) {
         if(sourceSize < SIZE_IN_TRITS) {
             byte[] dest = new byte[SIZE_IN_BYTES];
diff --git a/src/main/java/com/iota/iri/model/AddressHash.java b/src/main/java/com/iota/iri/model/AddressHash.java
@@ -2,6 +2,8 @@
 
 public class AddressHash extends AbstractHash {
 
+    public AddressHash() { }
+
     protected AddressHash(byte[] bytes, int offset, int sizeInBytes) {
         super(bytes, offset, sizeInBytes);
     }
diff --git a/src/main/java/com/iota/iri/model/BundleHash.java b/src/main/java/com/iota/iri/model/BundleHash.java
@@ -2,6 +2,8 @@
 
 public class BundleHash extends AbstractHash {
 
+    public BundleHash() { }
+
     protected BundleHash(byte[] bytes, int offset, int sizeInBytes) {
         super(bytes, offset, sizeInBytes);
     }
diff --git a/src/main/java/com/iota/iri/model/TagHash.java b/src/main/java/com/iota/iri/model/TagHash.java
@@ -2,6 +2,8 @@
 
 public class TagHash extends AbstractHash {
 
+    public TagHash() { }
+
     protected TagHash(byte[] tagBytes, int offset, int tagSizeInBytes) {
         super(tagBytes, offset, tagSizeInBytes);
     }
diff --git a/src/main/java/com/iota/iri/model/TransactionHash.java b/src/main/java/com/iota/iri/model/TransactionHash.java
@@ -6,7 +6,9 @@
 
 public class TransactionHash extends AbstractHash {
 
-	protected TransactionHash(byte[] source, int offset, int sourceSize) {
+    public TransactionHash() { }
+
+    protected TransactionHash(byte[] source, int offset, int sourceSize) {
 		super(source, offset, sourceSize);
 	}
 	
diff --git a/src/test/java/com/iota/iri/controllers/BundleViewModelTest.java b/src/test/java/com/iota/iri/controllers/BundleViewModelTest.java
@@ -1,8 +1,14 @@
 package com.iota.iri.controllers;
 
+import com.iota.iri.conf.MainnetConfig;
+import com.iota.iri.crypto.SpongeFactory;
+import com.iota.iri.model.TransactionHash;
+import com.iota.iri.service.snapshot.SnapshotProvider;
+import com.iota.iri.service.snapshot.impl.SnapshotProviderImpl;
 import com.iota.iri.storage.Tangle;
 import com.iota.iri.storage.rocksDB.RocksDBPersistenceProvider;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -14,6 +20,7 @@ public class BundleViewModelTest {
     private static final TemporaryFolder dbFolder = new TemporaryFolder();
     private static final TemporaryFolder logFolder = new TemporaryFolder();
     private static Tangle tangle = new Tangle();
+    private static SnapshotProvider snapshotProvider;
 
     @Before
     public void setUp() throws Exception {
@@ -24,6 +31,7 @@ public void setUp() throws Exception {
                 logFolder.getRoot().getAbsolutePath(),1000);
         tangle.addPersistenceProvider(rocksDBPersistenceProvider);
         tangle.init();
+        snapshotProvider = new SnapshotProviderImpl().init(new MainnetConfig());
 
     }
 
@@ -32,6 +40,8 @@ public void tearDown() throws Exception {
         tangle.shutdown();
         dbFolder.delete();
         logFolder.delete();
+        snapshotProvider.shutdown();
+
     }
 
     @Test
@@ -59,4 +69,14 @@ public void getTail() throws Exception {
 
     }
 
+    @Test
+    public void firstShouldFindTx() throws Exception {
+        byte[] trits = TransactionViewModelTest.getRandomTransactionTrits();
+        TransactionViewModel transactionViewModel = new TransactionViewModel(trits, TransactionHash.calculate(SpongeFactory.Mode.CURLP81, trits));
+        transactionViewModel.store(tangle, snapshotProvider.getInitialSnapshot());
+
+        BundleViewModel result = BundleViewModel.first(tangle);
+        Assert.assertTrue(result.getHashes().contains(transactionViewModel.getHash()));
+    }
+
 }
diff --git a/src/test/java/com/iota/iri/controllers/TransactionViewModelTest.java b/src/test/java/com/iota/iri/controllers/TransactionViewModelTest.java
@@ -11,9 +11,9 @@
 import com.iota.iri.storage.Tangle;
 import com.iota.iri.storage.rocksDB.RocksDBPersistenceProvider;
 import com.iota.iri.utils.Converter;
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Assert;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
@@ -36,8 +36,8 @@ public class TransactionViewModelTest {
 
     private static final Random seed = new Random();
 
-    @BeforeClass
-    public static void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         dbFolder.create();
         logFolder.create();
         RocksDBPersistenceProvider rocksDBPersistenceProvider;
@@ -48,8 +48,8 @@ public static void setUp() throws Exception {
         snapshotProvider = new SnapshotProviderImpl().init(new MainnetConfig());
     }
 
-    @AfterClass
-    public static void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         tangle.shutdown();
         snapshotProvider.shutdown();
         dbFolder.delete();
@@ -402,6 +402,16 @@ public void testManyTXInDB() throws Exception {
         log.info("Done. #TX: {}", TransactionViewModel.getNumberOfStoredTransactions(tangle));
     }
 
+    @Test
+    public void firstShouldFindTx() throws Exception {
+        byte[] trits = getRandomTransactionTrits();
+        TransactionViewModel transactionViewModel = new TransactionViewModel(trits, TransactionHash.calculate(SpongeFactory.Mode.CURLP81, trits));
+        transactionViewModel.store(tangle, snapshotProvider.getInitialSnapshot());
+
+        TransactionViewModel result = TransactionViewModel.first(tangle);
+        Assert.assertEquals(transactionViewModel.getHash(), result.getHash());
+    }
+
     private Transaction getRandomTransaction(Random seed) {
         Transaction transaction = new Transaction();
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`public class AddressHash extends AbstractHash {`
`4`	`4`
	`5`	`+ public AddressHash() { }`
	`6`	`+`
`5`	`7`	`protected AddressHash(byte[] bytes, int offset, int sizeInBytes) {`
`6`	`8`	`super(bytes, offset, sizeInBytes);`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`public class BundleHash extends AbstractHash {`
`4`	`4`
	`5`	`+ public BundleHash() { }`
	`6`	`+`
`5`	`7`	`protected BundleHash(byte[] bytes, int offset, int sizeInBytes) {`
`6`	`8`	`super(bytes, offset, sizeInBytes);`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`public class TagHash extends AbstractHash {`
`4`	`4`
	`5`	`+ public TagHash() { }`
	`6`	`+`
`5`	`7`	`protected TagHash(byte[] tagBytes, int offset, int tagSizeInBytes) {`
`6`	`8`	`super(tagBytes, offset, tagSizeInBytes);`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@`
`6`	`6`
`7`	`7`	`public class TransactionHash extends AbstractHash {`
`8`	`8`
`9`		`- protected TransactionHash(byte[] source, int offset, int sourceSize) {`
	`9`	`+ public TransactionHash() { }`
	`10`	`+`
	`11`	`+ protected TransactionHash(byte[] source, int offset, int sourceSize) {`
`10`	`12`	`super(source, offset, sourceSize);`
`11`	`13`	`}`
`12`	`14`