refactor

ontio · Nov 6, 2019 · 5cfe174 · 5cfe174
1 parent 299e26c
commit 5cfe174
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/main/java/com/github/ontio/core/transaction/Transaction.java b/src/main/java/com/github/ontio/core/transaction/Transaction.java
@@ -44,7 +44,6 @@ public abstract class Transaction extends Inventory {
     public Address payer = new Address();
     public Attribute[] attributes;
     public Sig[] sigs = new Sig[0];
-
     protected Transaction(TransactionType type) {
         this.txType = type;
     }
@@ -82,7 +81,6 @@ public static Transaction deserializeFrom(BinaryReader reader) throws IOExceptio
             throw new IOException(ex);
         }
     }
-
     @Override
     public void deserialize(BinaryReader reader) throws IOException {
         deserializeUnsigned(reader);
@@ -178,11 +176,11 @@ public Object json() {
         Map json = new HashMap();
         json.put("Hash", hash().toString());
         json.put("Version", (int) version);
-        json.put("Nonce", nonce & 0xFFFFFFFF);
+        json.put("Nonce", nonce& 0xFFFFFFFF);
         json.put("TxType", txType.value() & 0xFF);
-        json.put("GasPrice", gasPrice);
-        json.put("GasLimit", gasLimit);
-        json.put("Payer", payer.toBase58());
+        json.put("GasPrice",gasPrice);
+        json.put("GasLimit",gasLimit);
+        json.put("Payer",payer.toBase58());
         json.put("Attributes", Arrays.stream(attributes).map(p -> p.json()).toArray(Object[]::new));
         json.put("Sigs", Arrays.stream(sigs).map(p -> p.json()).toArray(Object[]::new));
         return json;

diff --git a/src/main/java/com/github/ontio/network/rest/http.java b/src/main/java/com/github/ontio/network/rest/http.java
@@ -135,6 +135,7 @@ public static String delete(String url, Map<String, String> params, Map<String,
     }
 
     public static String post(String url, Map<String, String> params, Map<String, Object> body) throws Exception {
+        //System.out.println(String.format("POST url=%s,%s,%s", url,JSON.toJSONString(params),JSON.toJSONString(body)));
         if(url.startsWith("https")){
             return post(url+cvtParams(params), JSON.toJSONString(body), true);
         }else{

diff --git a/src/main/java/demo/MakeTxWithoutWalletDemo.java b/src/main/java/demo/MakeTxWithoutWalletDemo.java
@@ -19,14 +19,26 @@
 
 package demo;
 
+import com.alibaba.fastjson.JSON;
 import com.github.ontio.OntSdk;
 import com.github.ontio.common.Address;
 import com.github.ontio.common.Helper;
+import com.github.ontio.core.VmType;
 import com.github.ontio.core.asset.Contract;
 import com.github.ontio.core.asset.State;
 import com.github.ontio.core.asset.Transfers;
 import com.github.ontio.core.payload.InvokeCode;
 import com.github.ontio.core.transaction.Transaction;
+import com.github.ontio.crypto.KeyType;
+import com.github.ontio.sdk.info.AccountInfo;
+import com.github.ontio.sdk.manager.WalletMgr;
+import com.github.ontio.sdk.wallet.Account;
+import com.github.ontio.sdk.wallet.Identity;
+
+import java.math.BigInteger;
+import java.security.Key;
+import java.util.HashMap;
+import java.util.Map;
 
 public class MakeTxWithoutWalletDemo {
     public static String privatekey1 = "49855b16636e70f100cc5f4f42bc20a6535d7414fb8845e7310f8dd065a97221";

diff --git a/src/test/java/com/github/ontio/core/payload/DeployCodeTest.java b/src/test/java/com/github/ontio/core/payload/DeployCodeTest.java
@@ -1,14 +1,16 @@
 package com.github.ontio.core.payload;
 
+import com.github.ontio.core.VmType;
 import com.github.ontio.io.BinaryReader;
 import com.github.ontio.io.BinaryWriter;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 public class DeployCodeTest {