adjustments after rebase

This commit is contained in:
Ian Norden 2019-12-02 11:35:16 -06:00
parent db0f024088
commit 313c5fe427
3 changed files with 6 additions and 6 deletions

View File

@ -38,7 +38,7 @@ func (queue *MockStorageQueue) Add(diff utils.StorageDiff) error {
if queue.AddPassedDiffs == nil { if queue.AddPassedDiffs == nil {
queue.AddPassedDiffs = make(map[int]utils.StorageDiff) queue.AddPassedDiffs = make(map[int]utils.StorageDiff)
} }
queue.AddPassedDiffs[diff.Id] = diff queue.AddPassedDiffs[diff.ID] = diff
return queue.AddError return queue.AddError
} }

View File

@ -36,7 +36,7 @@ func (transformer *MockStorageTransformer) Execute(diff utils.StorageDiff) error
if transformer.PassedDiffs == nil { if transformer.PassedDiffs == nil {
transformer.PassedDiffs = make(map[int]utils.StorageDiff) transformer.PassedDiffs = make(map[int]utils.StorageDiff)
} }
transformer.PassedDiffs[diff.Id] = diff transformer.PassedDiffs[diff.ID] = diff
return transformer.ExecuteErr return transformer.ExecuteErr
} }

View File

@ -151,7 +151,7 @@ var (
} }
CreatedExpectedStorageDiff = utils.StorageDiff{ CreatedExpectedStorageDiff = utils.StorageDiff{
Id: 0, ID: 0,
HashedAddress: common.BytesToHash(ContractLeafKey[:]), HashedAddress: common.BytesToHash(ContractLeafKey[:]),
BlockHash: common.HexToHash(BlockHash), BlockHash: common.HexToHash(BlockHash),
BlockHeight: int(BlockNumber.Int64()), BlockHeight: int(BlockNumber.Int64()),
@ -159,7 +159,7 @@ var (
StorageValue: common.BytesToHash(SmallStorageValue), StorageValue: common.BytesToHash(SmallStorageValue),
} }
UpdatedExpectedStorageDiff = utils.StorageDiff{ UpdatedExpectedStorageDiff = utils.StorageDiff{
Id: 0, ID: 0,
HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]), HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]),
BlockHash: common.HexToHash(BlockHash), BlockHash: common.HexToHash(BlockHash),
BlockHeight: int(BlockNumber.Int64()), BlockHeight: int(BlockNumber.Int64()),
@ -167,7 +167,7 @@ var (
StorageValue: common.BytesToHash(LargeStorageValue), StorageValue: common.BytesToHash(LargeStorageValue),
} }
UpdatedExpectedStorageDiff2 = utils.StorageDiff{ UpdatedExpectedStorageDiff2 = utils.StorageDiff{
Id: 0, ID: 0,
HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]), HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]),
BlockHash: common.HexToHash(BlockHash2), BlockHash: common.HexToHash(BlockHash2),
BlockHeight: int(BlockNumber2.Int64()), BlockHeight: int(BlockNumber2.Int64()),
@ -175,7 +175,7 @@ var (
StorageValue: common.BytesToHash(SmallStorageValue), StorageValue: common.BytesToHash(SmallStorageValue),
} }
DeletedExpectedStorageDiff = utils.StorageDiff{ DeletedExpectedStorageDiff = utils.StorageDiff{
Id: 0, ID: 0,
HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]), HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]),
BlockHash: common.HexToHash(BlockHash), BlockHash: common.HexToHash(BlockHash),
BlockHeight: int(BlockNumber.Int64()), BlockHeight: int(BlockNumber.Int64()),