Remove StorageRoot from vm.Account

This commit is contained in:
Jae Kwon
2015-07-28 12:39:10 -07:00
parent 5230440141
commit 1a5bc9eeb2
5 changed files with 16 additions and 30 deletions
+4 -5
View File
@@ -36,11 +36,10 @@ func (fas *FakeAppState) CreateAccount(creator *Account) *Account {
account := fas.accounts[addr.String()]
if account == nil {
return &Account{
Address: addr,
Balance: 0,
Code: nil,
Nonce: 0,
StorageRoot: Zero256,
Address: addr,
Balance: 0,
Code: nil,
Nonce: 0,
}
} else {
panic(Fmt("Invalid account addr: %X", addr))
+7 -8
View File
@@ -10,12 +10,11 @@ const (
)
type Account struct {
Address Word256
Balance int64
Code []byte
Nonce int64
StorageRoot Word256
Other interface{} // For holding all other data.
Address Word256
Balance int64
Code []byte
Nonce int64
Other interface{} // For holding all other data.
Permissions ptypes.AccountPermissions
}
@@ -24,8 +23,8 @@ func (acc *Account) String() string {
if acc == nil {
return "nil-VMAccount"
}
return Fmt("VMAccount{%X B:%v C:%X N:%v S:%X}",
acc.Address, acc.Balance, acc.Code, acc.Nonce, acc.StorageRoot)
return Fmt("VMAccount{%X B:%v C:%X N:%v}",
acc.Address, acc.Balance, acc.Code, acc.Nonce)
}
// NOTE: This is serialized as an event from vm/vm.