From b4f2cf1bf57834449bc41ff4bca5138d35e67bc9 Mon Sep 17 00:00:00 2001 From: pmmax Date: Tue, 12 Feb 2019 16:32:14 -0300 Subject: [PATCH] Added a method to quickly switch the testnet --- .../AlgoTokenV1Tests.cs | 4 ++-- .../AlgoFeesTests.cs | 6 +++--- .../AlgoMinerTests.cs | 4 ++-- .../AlgoPoolTests.cs | 6 +++--- .../EthNetwork.cs | 2 ++ 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/labs/algo-erc20-token/test/AdvancedAlgos.AlgoToken.AlgoErc20Token.IntegrationTests/AlgoTokenV1Tests.cs b/labs/algo-erc20-token/test/AdvancedAlgos.AlgoToken.AlgoErc20Token.IntegrationTests/AlgoTokenV1Tests.cs index f19264bde..78e097536 100644 --- a/labs/algo-erc20-token/test/AdvancedAlgos.AlgoToken.AlgoErc20Token.IntegrationTests/AlgoTokenV1Tests.cs +++ b/labs/algo-erc20-token/test/AdvancedAlgos.AlgoToken.AlgoErc20Token.IntegrationTests/AlgoTokenV1Tests.cs @@ -17,7 +17,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoErc20Token.IntegrationTests [Fact] public async Task DeployContractAndTransferTokensTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var account1 = new Account(EthNetwork.Instance.PrefundedPrivateKey); var account2 = EthAccountFactory.Create(); @@ -39,7 +39,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoErc20Token.IntegrationTests [Fact] public async Task PausableFeatureTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var account1 = new Account(EthNetwork.Instance.PrefundedPrivateKey); var account2 = EthAccountFactory.Create(); diff --git a/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoFeesTests.cs b/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoFeesTests.cs index 56bbafc40..ad3bf61b1 100644 --- a/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoFeesTests.cs +++ b/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoFeesTests.cs @@ -17,7 +17,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests [Fact] public async Task MinerRegistrationTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var prefundedAccount = new Account(EthNetwork.Instance.PrefundedPrivateKey); @@ -101,7 +101,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests [Fact] public async Task MineTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var prefundedAccount = new Account(EthNetwork.Instance.PrefundedPrivateKey); @@ -181,7 +181,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests [Fact] public async Task TerminateTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var prefundedAccount = new Account(EthNetwork.Instance.PrefundedPrivateKey); diff --git a/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoMinerTests.cs b/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoMinerTests.cs index 0fa0aa1c0..afd0384f2 100644 --- a/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoMinerTests.cs +++ b/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoMinerTests.cs @@ -16,7 +16,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests [Fact] public async Task PoolBasedMinerBasicWorkfloWTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var prefundedAccount = new Account(EthNetwork.Instance.PrefundedPrivateKey); @@ -115,7 +115,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests [Fact] public async Task TerminateTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var prefundedAccount = new Account(EthNetwork.Instance.PrefundedPrivateKey); diff --git a/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoPoolTests.cs b/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoPoolTests.cs index 0f6f67e98..5268bcc4c 100644 --- a/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoPoolTests.cs +++ b/labs/algo-token-distribution/test/AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests/AlgoPoolTests.cs @@ -17,7 +17,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests [Fact] public async Task MinerPoolTransferToMinerTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var prefundedAccount = new Account(EthNetwork.Instance.PrefundedPrivateKey); @@ -72,7 +72,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests [Fact] public async Task ReferralPoolTransferToMinerTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var prefundedAccount = new Account(EthNetwork.Instance.PrefundedPrivateKey); @@ -127,7 +127,7 @@ namespace AdvancedAlgos.AlgoToken.AlgoTokenDistribution.IntegrationTests [Fact] public async Task TerminateTest() { - EthNetwork.UseGanacheTestNet(); + EthNetwork.UseDefaultTestNet(); var prefundedAccount = new Account(EthNetwork.Instance.PrefundedPrivateKey); diff --git a/labs/framework/src/AdvancedAlgos.AlgoToken.Framework.Ethereum.IntegrationTest/EthNetwork.cs b/labs/framework/src/AdvancedAlgos.AlgoToken.Framework.Ethereum.IntegrationTest/EthNetwork.cs index 8f1675e54..908600832 100644 --- a/labs/framework/src/AdvancedAlgos.AlgoToken.Framework.Ethereum.IntegrationTest/EthNetwork.cs +++ b/labs/framework/src/AdvancedAlgos.AlgoToken.Framework.Ethereum.IntegrationTest/EthNetwork.cs @@ -26,6 +26,8 @@ namespace AdvancedAlgos.AlgoToken.Framework.Ethereum.IntegrationTest public IGasPriceProvider GasPriceProvider { get; private set; } public BigInteger TxBaseFeeWei => GasPriceProvider.GetGasPrice() * TRANSACTION_BASE_FEE; + public static void UseDefaultTestNet() => UseGethTestNet(); + public static void UseGanacheTestNet() { Instance = new EthNetwork