Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using FluentAssertions;
using Nethermind.Abi;
using Nethermind.Blockchain;
Expand Down Expand Up @@ -91,7 +90,7 @@ public void returns_data_from_getAll_on_non_consecutive_receipts_with_incrementa
}

[Test]
public async Task returns_data_from_receipts_on_non_consecutive_with_not_incremental_changes()
public void returns_data_from_receipts_on_non_consecutive_with_not_incremental_changes()
{
TestCase<Address> testCase = BuildTestCase<Address>();
testCase.DataContract.IncrementalChanges.Returns(false);
Expand All @@ -109,9 +108,10 @@ public async Task returns_data_from_receipts_on_non_consecutive_with_not_increme
testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));

await Task.Delay(10); // delay for refresh from contract as its async

testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Should().BeEquivalentTo(expected.Cast<object>());
Assert.That(
() => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
Is.EquivalentTo(expected.Cast<object>()).After(200, 20)
);
}

[Test]
Expand All @@ -127,7 +127,7 @@ public void returns_data_from_getAll_on_non_consecutive_with_not_incremental_cha
}

[Test]
public async Task returns_data_from_receipts_on_consecutive_with_not_incremental_changes()
public void returns_data_from_receipts_on_consecutive_with_not_incremental_changes()
{
TestCase<Address> testCase = BuildTestCase<Address>();
testCase.DataContract.IncrementalChanges.Returns(false);
Expand All @@ -145,13 +145,14 @@ public async Task returns_data_from_receipts_on_consecutive_with_not_incremental
testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));

await Task.Delay(10); // delay for refresh from contract as its async

testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Should().BeEquivalentTo(expected.Cast<object>());
Assert.That(
() => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
Is.EquivalentTo(expected.Cast<object>()).After(200, 20)
);
}

[Test]
public async Task returns_data_from_receipts_on_consecutive_with_incremental_changes()
public void returns_data_from_receipts_on_consecutive_with_incremental_changes()
{
TestCase<Address> testCase = BuildTestCase<Address>();
BlockHeader blockHeader = Build.A.BlockHeader.WithNumber(1).WithHash(TestItem.KeccakA).TestObject;
Expand All @@ -167,16 +168,14 @@ public async Task returns_data_from_receipts_on_consecutive_with_incremental_cha
testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));

await Task.Delay(50); // delay for refresh from contract as its async

Assert.That(
() => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).ToList(),
Is.EquivalentTo(new ArrayList() { TestItem.AddressA, TestItem.AddressB }).After(1000, 100)
Is.EquivalentTo(new ArrayList() { TestItem.AddressA, TestItem.AddressB }).After(200, 20)
);
}

[Test]
public async Task returns_unmodified_data_from_empty_receipts_on_consecutive_with_incremental_changes()
public void returns_unmodified_data_from_empty_receipts_on_consecutive_with_incremental_changes()
{
TestCase<Address> testCase = BuildTestCase<Address>();
BlockHeader blockHeader = Build.A.BlockHeader.WithNumber(1).WithHash(TestItem.KeccakA).TestObject;
Expand All @@ -192,13 +191,14 @@ public async Task returns_unmodified_data_from_empty_receipts_on_consecutive_wit
testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));

await Task.Delay(10); // delay for refresh from contract as its async

testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Should().BeEquivalentTo(TestItem.AddressA, TestItem.AddressC);
Assert.That(
() => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
Is.EquivalentTo(new[] { TestItem.AddressA, TestItem.AddressC }).After(200, 20)
);
}

[Test]
public async Task returns_data_from_receipts_on_consecutive_with_incremental_changes_with_identity()
public void returns_data_from_receipts_on_consecutive_with_incremental_changes_with_identity()
{
TestCase<TxPriorityContract.Destination> testCase = BuildTestCase(
TxPriorityContract.DistinctDestinationMethodComparer.Instance,
Expand Down Expand Up @@ -227,11 +227,9 @@ public async Task returns_data_from_receipts_on_consecutive_with_incremental_cha
testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));

await Task.Delay(10); // delay for refresh from contract as its async

Assert.That(
() => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Count(),
Is.EqualTo(3).After(1000, 100)
Is.EqualTo(3).After(200, 20)
);

testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Should().BeEquivalentTo(new[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void combines_contract_and_local_data_correctly()

Assert.That(
() => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
Is.EquivalentTo(expected.Cast<object>()).After(1000, 100)
Is.EquivalentTo(expected.Cast<object>()).After(200, 20)
);

localDataSource.Data.Returns(new[] { TestItem.AddressC, TestItem.AddressD });
Expand All @@ -95,7 +95,7 @@ public void combines_contract_and_local_data_correctly()

Assert.That(
() => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
Is.EquivalentTo(expected.Cast<object>()).After(1000, 100)
Is.EquivalentTo(expected.Cast<object>()).After(200, 20)
);
}

Expand Down