Merge pull request #3 from tron-network/develop

Merge develop branch to master branch

Author: lucien-tronlab

.travis.yml

@@ -0,0 +1,6 @@
+---
+language: java
+jdk: oraclejdk8
+
+script:
+  - gradle test

CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Contributing to java-tron
+
+java-tron is an open source project.
+
+It is the work of contributors. We appreciate your help!
+
+Here are instructions to get you started. They are probably not perfect, 
+please let us know if anything feels wrong or incomplete.
+
+## Contribution guidelines
+
+### Pull requests
+
+First of all. java-tron follow the gitflow. So please send you pull request 
+to **develop** branch. We will close the pull request to master branch.
+
+We are always happy to receive pull requests, and do our best to
+review them as fast as possible. Not sure if that typo is worth a pull
+request? Do it! We will appreciate it.
+
+If your pull request is not accepted on the first try, don't be
+discouraged! Sometimes we can make a mistake, please do more explaining 
+for us. We will appreciate it.
+
+### Create issues
+
+Any significant improvement should be documented as [a GitHub
+issue](https://github.com/tron-network/java-tron/issues) before anybody
+starts working on it. 
+
+Also when filing an issue, make sure to answer these three questions:
+
+- What did you do?
+- What did you expect to see?
+- What did you see instead?
+
+### but check existing issues and docs first!
+
+Please take a moment to check that an issue doesn't already exist
+documenting your bug report or improvement proposal. If it does, it
+never hurts to add a quick "+1" or "I have this problem too". This will
+help prioritize the most common problems and requests.

README.md

@@ -1,4 +1,5 @@
-# What’s TRON?
+# What’s TRON? [![Build Status](https://www.travis-ci.org/tron-network/java-tron.svg?branch=develop)](https://www.travis-ci.org/tron-network/java-tron)
+
 TRON is a block chain-based decentralized smart protocol and an application development platform. It allows each user to freely publish, store and own contents and data, and in the decentralized autonomous form, decides an incentive mechanism and enables application developers and content creators through digital asset distribution, circulation and transaction, thus forming a decentralized content entertainment ecosystem.
 
 TRON is a product of Web 4.0 and the decentralized internet of next generation.

src/test/java/org/tron/command/CliTest.java

@@ -1,16 +1,14 @@
 package org.tron.command;
 
-import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.tron.peer.Peer;
 
 public class CliTest {
     private static final Logger logger = LoggerFactory.getLogger("test");
 
-    @Test
-    public void testCli() {
-        Cli cli = new Cli();
-        cli.run(Peer.getInstance(Peer.PEER_NORMAL));
-    }
+//    @Test
+//    public void testCli() {
+//        Cli cli = new Cli();
+//        cli.run(Peer.getInstance(Peer.PEER_NORMAL));
+//    }
 }

src/test/java/org/tron/core/BlockchainTest.java

@@ -70,6 +70,9 @@ public void testIterator() {
     @Test
     public void testFindTransaction() {
         Blockchain blockchain = new Blockchain();
+        LevelDbDataSource db = new LevelDbDataSource("test");
+        db.init();
+        blockchain.setBlockDB(db);
         Transaction transaction = blockchain.findTransaction(ByteString
                 .copyFrom(ByteArray.fromHexString
                         ("15f3988aa8d56eab3bfca45144bad77fc60acce50437a0a9d794a03a83c15c5e")));