Merge pull request #1156 from tgerring/issue1145

Differentiate between 0 and unspecified gas/gasprice

1 files changed, 12 insertions, 8 deletions

diff --git a/rpc/args_test.go b/rpc/args_test.go
index 09ce12467..aef459961 100644
--- a/rpc/args_test.go
+++ b/rpc/args_test.go
@@ -573,14 +573,15 @@ func TestNewTxArgsGasMissing(t *testing.T) {
   "data": "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675"
   }]`
 	expected := new(NewTxArgs)
-	expected.Gas = big.NewInt(0)
+	expected.Gas = nil
 
 	args := new(NewTxArgs)
 	if err := json.Unmarshal([]byte(input), &args); err != nil {
 		t.Error(err)
 	}
 
-	if bytes.Compare(expected.Gas.Bytes(), args.Gas.Bytes()) != 0 {
+	if args.Gas != expected.Gas {
+		// if bytes.Compare(expected.Gas.Bytes(), args.Gas.Bytes()) != 0 {
 		t.Errorf("Gas shoud be %v but is %v", expected.Gas, args.Gas)
 	}
 }
@@ -594,14 +595,15 @@ func TestNewTxArgsBlockGaspriceMissing(t *testing.T) {
   "data": "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675"
   }]`
 	expected := new(NewTxArgs)
-	expected.GasPrice = big.NewInt(0)
+	expected.GasPrice = nil
 
 	args := new(NewTxArgs)
 	if err := json.Unmarshal([]byte(input), &args); err != nil {
 		t.Error(err)
 	}
 
-	if bytes.Compare(expected.GasPrice.Bytes(), args.GasPrice.Bytes()) != 0 {
+	if args.GasPrice != expected.GasPrice {
+		// if bytes.Compare(expected.GasPrice.Bytes(), args.GasPrice.Bytes()) != 0 {
 		t.Errorf("GasPrice shoud be %v but is %v", expected.GasPrice, args.GasPrice)
 	}
 
@@ -829,9 +831,10 @@ func TestCallArgsGasMissing(t *testing.T) {
 	}
 
 	expected := new(CallArgs)
-	expected.Gas = big.NewInt(0)
+	expected.Gas = nil
 
-	if bytes.Compare(expected.Gas.Bytes(), args.Gas.Bytes()) != 0 {
+	if args.Gas != expected.Gas {
+		// if bytes.Compare(expected.Gas.Bytes(), args.Gas.Bytes()) != 0 {
 		t.Errorf("Gas shoud be %v but is %v", expected.Gas, args.Gas)
 	}
 
@@ -852,9 +855,10 @@ func TestCallArgsBlockGaspriceMissing(t *testing.T) {
 	}
 
 	expected := new(CallArgs)
-	expected.GasPrice = big.NewInt(0)
+	expected.GasPrice = nil
 
-	if bytes.Compare(expected.GasPrice.Bytes(), args.GasPrice.Bytes()) != 0 {
+	if args.GasPrice != expected.GasPrice {
+		// if bytes.Compare(expected.GasPrice.Bytes(), args.GasPrice.Bytes()) != 0 {
 		t.Errorf("GasPrice shoud be %v but is %v", expected.GasPrice, args.GasPrice)
 	}
 }