From 313c5fe4270035a34c1ea0dd9984bea600a0a9df Mon Sep 17 00:00:00 2001 From: Ian Norden Date: Mon, 2 Dec 2019 11:35:16 -0600 Subject: [PATCH] adjustments after rebase --- libraries/shared/mocks/storage_queue.go | 2 +- libraries/shared/mocks/storage_transformer.go | 2 +- libraries/shared/test_data/statediff.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/shared/mocks/storage_queue.go b/libraries/shared/mocks/storage_queue.go index dd871cb4..889be21e 100644 --- a/libraries/shared/mocks/storage_queue.go +++ b/libraries/shared/mocks/storage_queue.go @@ -38,7 +38,7 @@ func (queue *MockStorageQueue) Add(diff utils.StorageDiff) error { if queue.AddPassedDiffs == nil { queue.AddPassedDiffs = make(map[int]utils.StorageDiff) } - queue.AddPassedDiffs[diff.Id] = diff + queue.AddPassedDiffs[diff.ID] = diff return queue.AddError } diff --git a/libraries/shared/mocks/storage_transformer.go b/libraries/shared/mocks/storage_transformer.go index 798de0ac..04a091de 100644 --- a/libraries/shared/mocks/storage_transformer.go +++ b/libraries/shared/mocks/storage_transformer.go @@ -36,7 +36,7 @@ func (transformer *MockStorageTransformer) Execute(diff utils.StorageDiff) error if transformer.PassedDiffs == nil { transformer.PassedDiffs = make(map[int]utils.StorageDiff) } - transformer.PassedDiffs[diff.Id] = diff + transformer.PassedDiffs[diff.ID] = diff return transformer.ExecuteErr } diff --git a/libraries/shared/test_data/statediff.go b/libraries/shared/test_data/statediff.go index 46edd932..f9bfd8fe 100644 --- a/libraries/shared/test_data/statediff.go +++ b/libraries/shared/test_data/statediff.go @@ -151,7 +151,7 @@ var ( } CreatedExpectedStorageDiff = utils.StorageDiff{ - Id: 0, + ID: 0, HashedAddress: common.BytesToHash(ContractLeafKey[:]), BlockHash: common.HexToHash(BlockHash), BlockHeight: int(BlockNumber.Int64()), @@ -159,7 +159,7 @@ var ( StorageValue: common.BytesToHash(SmallStorageValue), } UpdatedExpectedStorageDiff = utils.StorageDiff{ - Id: 0, + ID: 0, HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]), BlockHash: common.HexToHash(BlockHash), BlockHeight: int(BlockNumber.Int64()), @@ -167,7 +167,7 @@ var ( StorageValue: common.BytesToHash(LargeStorageValue), } UpdatedExpectedStorageDiff2 = utils.StorageDiff{ - Id: 0, + ID: 0, HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]), BlockHash: common.HexToHash(BlockHash2), BlockHeight: int(BlockNumber2.Int64()), @@ -175,7 +175,7 @@ var ( StorageValue: common.BytesToHash(SmallStorageValue), } DeletedExpectedStorageDiff = utils.StorageDiff{ - Id: 0, + ID: 0, HashedAddress: common.BytesToHash(AnotherContractLeafKey[:]), BlockHash: common.HexToHash(BlockHash), BlockHeight: int(BlockNumber.Int64()),