From 1676930a1644f06dafc66e2b5595eb343ffebc07 Mon Sep 17 00:00:00 2001 From: obscuren Date: Sun, 5 Jan 2014 20:41:01 +0100 Subject: [PATCH] updated testing" --- parsing_test.go | 4 ++-- testing.go | 3 ++- transaction.go | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/parsing_test.go b/parsing_test.go index fa319e7bf..6aa9e240c 100644 --- a/parsing_test.go +++ b/parsing_test.go @@ -6,13 +6,13 @@ import ( ) func TestCompile(t *testing.T) { - instr, err := CompileInstr("SET 10 1") + instr, err := CompileInstr("PUSH") if err != nil { t.Error("Failed compiling instruction") } - calc := (67 + 10 * 256 + 1 * int64(math.Pow(256,2))) + calc := (48 + 0 * 256 + 0 * int64(math.Pow(256,2))) if Big(instr).Int64() != calc { t.Error("Expected", calc, ", got:", instr) } diff --git a/testing.go b/testing.go index 64c34ca70..3762e4dc5 100644 --- a/testing.go +++ b/testing.go @@ -13,8 +13,9 @@ func Testing() { bm := NewBlockManager() - tx := NewTransaction("\x00", 20, []string{"PSH 10"}) + tx := NewTransaction("\x00", 20, []string{"PUSH"}) txData := tx.MarshalRlp() + fmt.Printf("%q\n", txData) copyTx := &Transaction{} copyTx.UnmarshalRlp(txData) diff --git a/transaction.go b/transaction.go index a3279aa33..168d58566 100644 --- a/transaction.go +++ b/transaction.go @@ -2,7 +2,7 @@ package main import ( "math/big" - "fmt" + _"fmt" "github.com/obscuren/secp256k1-go" _"encoding/hex" _"crypto/sha256" @@ -140,7 +140,6 @@ func (tx *Transaction) MarshalRlp() []byte { func (tx *Transaction) UnmarshalRlp(data []byte) { t, _ := Decode(data,0) if slice, ok := t.([]interface{}); ok { - fmt.Printf("NONCE %T\n", slice[3]) if nonce, ok := slice[0].(uint8); ok { tx.nonce = string(nonce) } @@ -186,7 +185,6 @@ func (tx *Transaction) UnmarshalRlp(data []byte) { } // vrs - fmt.Printf("v %T\n", slice[5]) if v, ok := slice[5].(uint8); ok { tx.v = uint32(v) }