Account.Code bug found and fixed. Tests are updated

db/substate_db_test.go

@@ -81,10 +81,9 @@ func TestSubstateDB_GetSubstate(t *testing.T) {
 		t.Fatal("substate is nil")
 	}
 
-	// todo code does weird stuff
-	//if err = ss.Equal(testSubstate); err != nil {
-	//	t.Fatalf("substates are different; %v", err)
-	//}
+	if err = ss.Equal(testSubstate); err != nil {
+		t.Fatalf("substates are different; %v", err)
+	}
 }
 
 func TestSubstateDB_DeleteSubstate(t *testing.T) {
@@ -121,6 +120,8 @@ func createDbAndPutSubstate(dbPath string) (*substateDB, error) {
 	h2 := types.Hash{}
 	h2.SetBytes(nil)
 
+	tt := &testSubstate
+	_ = tt
 	testSubstate.InputSubstate[types.Address{1}] = substate.NewAccount(1, new(big.Int).SetUint64(1), h1[:])
 	testSubstate.OutputSubstate[types.Address{2}] = substate.NewAccount(2, new(big.Int).SetUint64(2), h2[:])
 	testSubstate.Env.BlockHashes[1] = types.BytesToHash([]byte{1})

db/update_db_test.go

@@ -80,10 +80,9 @@ func TestUpdateDB_GetUpdateSet(t *testing.T) {
 		t.Fatal("update-set is nil")
 	}
 
-	// todo code does weird stuff
-	//if err = ss.Equal(testSubstate); err != nil {
-	//	t.Fatalf("substates are different; %v", err)
-	//}
+	if !us.Equal(testUpdateSet) {
+		t.Fatal("substates are different")
+	}
 }
 
 func TestUpdateDB_DeleteUpdateSet(t *testing.T) {

rlp/rlp.go

@@ -58,9 +58,17 @@ func (r *RLP) ToSubstate(getHashFunc func(codeHash types.Hash) ([]byte, error),
 		return nil, err
 	}
 
+	input, err := r.InputSubstate.ToSubstate(getHashFunc)
+	if err != nil {
+		return nil, err
+	}
+	output, err := r.OutputSubstate.ToSubstate(getHashFunc)
+	if err != nil {
+		return nil, err
+	}
 	return &substate.Substate{
-		InputSubstate:  r.InputSubstate.ToSubstate(),
-		OutputSubstate: r.OutputSubstate.ToSubstate(),
+		InputSubstate:  input,
+		OutputSubstate: output,
 		Env:            r.Env.ToSubstate(),
 		Message:        msg,
 		Result:         r.Result.ToSubstate(),

rlp/rlp_message.go

@@ -56,7 +56,7 @@ type Message struct {
 func (m Message) ToSubstate(getHashFunc func(codeHash types.Hash) ([]byte, error)) (*substate.Message, error) {
 	sm := &substate.Message{
 		Nonce:      m.Nonce,
-		CheckNonce: !m.CheckNonce, //TODO: find out if this is correct
+		CheckNonce: m.CheckNonce,
 		GasPrice:   m.GasPrice,
 		Gas:        m.Gas,
 		From:       m.From,

rlp/rlp_world_state.go

@@ -25,7 +25,7 @@ type WorldState struct {
 }
 
 // ToSubstate transforms a from WorldState to substate.WorldState.
-func (ws WorldState) ToSubstate() substate.WorldState {
+func (ws WorldState) ToSubstate(getHashFunc func(codeHash types.Hash) ([]byte, error)) (substate.WorldState, error) {
 	sws := make(substate.WorldState)
 
 	// iterate through addresses and assign it correctly to substate.WorldState
@@ -34,11 +34,15 @@ func (ws WorldState) ToSubstate() substate.WorldState {
 	// Address at second position matches SubstateAccountRLP at second position, and so on
 	for i, addr := range ws.Addresses {
 		acc := ws.Accounts[i]
-		sws[addr] = substate.NewAccount(acc.Nonce, acc.Balance, acc.CodeHash[:])
+		code, err := getHashFunc(acc.CodeHash)
+		if err != nil {
+			return nil, err
+		}
+		sws[addr] = substate.NewAccount(acc.Nonce, acc.Balance, code)
 		for pos := range acc.Storage {
 			sws[addr].Storage[acc.Storage[pos][0]] = acc.Storage[pos][1]
 		}
 	}
 
-	return sws
+	return sws, nil
 }

updateset/update_set.go

@@ -73,3 +73,23 @@ func (up UpdateSetRLP) ToWorldState(getCodeFunc func(codeHash types.Hash) ([]byt
 
 	return NewUpdateSet(worldState, block), nil
 }
+
+func (x *UpdateSet) Equal(y *UpdateSet) bool {
+	if x == y {
+		return true
+	}
+	if !x.WorldState.Equal(y.WorldState) {
+		return false
+	}
+
+	if x.Block != y.Block {
+		return false
+	}
+
+	for i, val := range x.DeletedAccounts {
+		if val != y.DeletedAccounts[i] {
+			return false
+		}
+	}
+	return true
+}