Merge branch 'develop' into fix_tests_v2

Author: Sunny6889

framework/src/test/java/org/tron/keystore/CredentialsTest.java

@@ -24,7 +24,9 @@ private SignInterface mockSignInterface(byte[] address) {
   @Test
   public void testCreate() {
     SignInterface signInterface = mockSignInterface(ADDRESS_1);
+
     Credentials credentials = Credentials.create(signInterface);
+
     Assert.assertEquals("Credentials address create failed!",
         StringUtil.encode58Check(ADDRESS_1), credentials.getAddress());
     Assert.assertSame("Credentials cryptoEngine create failed", signInterface,