status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
romanman 2014-06-22 18:22:33 +01:00
parent 7fbd2964b5 5c563e819a
commit 57c6725dd5
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ethereumj-core/pom.xml
View File

@ -193,7 +193,6 @@ mvn clean package -Dmaven.test.skip=true
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version> <version>1.3</version>
@ -214,9 +213,42 @@ mvn clean package -Dmaven.test.skip=true
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-dependency-plugin
</artifactId>
<versionRange>
[2.0,)
</versionRange>
<goals>
<goal>unpack</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build> </build>
</project> </project>

15
ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java
View File

@ -1,6 +1,9 @@
package org.ethereum.trie; package org.ethereum.trie;
import java.io.IOException; import java.io.IOException;
import java.util.Map.Entry;
import java.util.Spliterator;
import java.util.function.Consumer;
import org.iq80.leveldb.DB; import org.iq80.leveldb.DB;
import org.iq80.leveldb.DBException; import org.iq80.leveldb.DBException;
@ -128,5 +131,17 @@ public class MockDB implements DB {
public int getAddedItems() { public int getAddedItems() {
return addedItems; return addedItems;
} }
@Override
public void forEach(Consumer<? super Entry<byte[], byte[]>> action) {
// TODO Auto-generated method stub
}
@Override
public Spliterator<Entry<byte[], byte[]>> spliterator() {
// TODO Auto-generated method stub
return null;
}
} }