Fixed some tests

ethchain/vm_test.go

@@ -11,71 +11,6 @@ import (
 	"testing"
 )
 
-/*
-func TestRun3(t *testing.T) {
-	ethutil.ReadConfig("")
-
-	db, _ := ethdb.NewMemDatabase()
-	state := NewState(ethutil.NewTrie(db, ""))
-
-	script := Compile([]string{
-		"PUSH", "300",
-		"PUSH", "0",
-		"MSTORE",
-
-		"PUSH", "32",
-		"CALLDATA",
-
-		"PUSH", "64",
-		"PUSH", "0",
-		"RETURN",
-	})
-	tx := NewContractCreationTx(ethutil.Big("0"), ethutil.Big("1000"), script)
-	addr := tx.Hash()[12:]
-	contract := MakeContract(tx, state)
-	state.UpdateContract(contract)
-
-	callerScript := ethutil.Assemble(
-		"PUSH", 1337, // Argument
-		"PUSH", 65, // argument mem offset
-		"MSTORE",
-		"PUSH", 64, // ret size
-		"PUSH", 0, // ret offset
-
-		"PUSH", 32, // arg size
-		"PUSH", 65, // arg offset
-		"PUSH", 1000, /// Gas
-		"PUSH", 0, /// value
-		"PUSH", addr, // Sender
-		"CALL",
-		"PUSH", 64,
-		"PUSH", 0,
-		"RETURN",
-	)
-	callerTx := NewContractCreationTx(ethutil.Big("0"), ethutil.Big("1000"), callerScript)
-
-	// Contract addr as test address
-	account := NewAccount(ContractAddr, big.NewInt(10000000))
-	callerClosure := NewClosure(account, MakeContract(callerTx, state), state, big.NewInt(1000000000), new(big.Int))
-
-	vm := NewVm(state, RuntimeVars{
-		origin:      account.Address(),
-		blockNumber: 1,
-		prevHash:    ethutil.FromHex("5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"),
-		coinbase:    ethutil.FromHex("2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"),
-		time:        1,
-		diff:        big.NewInt(256),
-		// XXX Tx data? Could be just an argument to the closure instead
-		txData: nil,
-	})
-	ret := callerClosure.Call(vm, nil)
-
-	exp := []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 57}
-	if bytes.Compare(ret, exp) != 0 {
-		t.Errorf("expected return value to be %v, got %v", exp, ret)
-	}
-}*/
-
 func TestRun4(t *testing.T) {
 	ethutil.ReadConfig("")
 
@@ -142,7 +77,7 @@ func TestRun4(t *testing.T) {
 		fmt.Println(err)
 	}
 	fmt.Println("account.Amount =", account.Amount)
-	callerClosure := NewClosure(account, c, c.script, state, gas, gasPrice, big.NewInt(0))
+	callerClosure := NewClosure(account, c, c.script, state, gas, gasPrice)
 
 	vm := NewVm(state, nil, RuntimeVars{
 		Origin:      account.Address(),

ethutil/common_test.go

@@ -26,7 +26,7 @@ func TestCommon(t *testing.T) {
 		t.Error("Got", szabo)
 	}
 
-	if vito != "10 Vito" {
+	if vito != "10 Vita" {
 		t.Error("Got", vito)
 	}
 

ethutil/rlp_test.go

@@ -2,7 +2,6 @@ package ethutil
 
 import (
 	"bytes"
-	"fmt"
 	"math/big"
 	"reflect"
 	"testing"
@@ -56,15 +55,6 @@ func TestValue(t *testing.T) {
 	}
 }
 
-func TestEncodeDecodeMaran(t *testing.T) {
-	b := NewValue([]interface{}{"dog", 15, []interface{}{"cat", "cat", []interface{}{}}, 1024, "tachikoma"})
-	a := b.Encode()
-	fmt.Println("voor maran", a)
-	f, i := Decode(a, 0)
-	fmt.Println("voor maran 2", f)
-	fmt.Println(i)
-}
-
 func TestEncode(t *testing.T) {
 	strRes := "\x83dog"
 	bytes := Encode("dog")
@@ -131,7 +121,10 @@ func TestEncodeDecodeBytes(t *testing.T) {
 
 func TestEncodeZero(t *testing.T) {
 	b := NewValue(0).Encode()
-	fmt.Println(b)
+	exp := []byte{0xc0}
+	if bytes.Compare(b, exp) == 0 {
+		t.Error("Expected", exp, "got", b)
+	}
 }
 
 func BenchmarkEncodeDecode(b *testing.B) {