address Roman review

osmosis-labs · Aug 12, 2022 · 5eecad5 · 5eecad5
1 parent faf72b1
commit 5eecad5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 30 deletions.
diff --git a/tests/e2e/configurer/chain/chain.go b/tests/e2e/configurer/chain/chain.go
@@ -9,6 +9,8 @@ import (
 	"github.com/stretchr/testify/require"
 	coretypes "github.com/tendermint/tendermint/rpc/core/types"
 
+	"github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer/config"
+
 	"github.com/osmosis-labs/osmosis/v10/tests/e2e/containers"
 	"github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization"
 )
@@ -41,13 +43,16 @@ const (
 )
 
 func New(t *testing.T, containerManager *containers.Manager, id string, initValidatorConfigs []*initialization.NodeConfig) *Config {
+	numVal := float32(len(initValidatorConfigs))
 	return &Config{
 		ChainMeta: initialization.ChainMeta{
 			Id: id,
 		},
-		ValidatorInitConfigs: initValidatorConfigs,
-		t:                    t,
-		containerManager:     containerManager,
+		ValidatorInitConfigs:  initValidatorConfigs,
+		VotingPeriod:          config.PropDepositBlocks + numVal*config.PropVoteBlocks + config.PropBufferBlocks,
+		ExpeditedVotingPeriod: config.PropDepositBlocks + numVal*config.PropVoteBlocks + config.PropBufferBlocks - 1,
+		t:                     t,
+		containerManager:      containerManager,
 	}
 }
 

diff --git a/tests/e2e/configurer/chain/commands.go b/tests/e2e/configurer/chain/commands.go
@@ -5,7 +5,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	appparams "github.com/osmosis-labs/osmosis/v10/app/params"
@@ -115,8 +114,7 @@ func (n *NodeConfig) CreateWallet(walletName string) string {
 	return walletAddr
 }
 
-func (n *NodeConfig) QueryPropStatusTimed(wg *sync.WaitGroup, proposalNumber int, desiredStatus string, totalTime chan time.Duration) {
-	defer wg.Done()
+func (n *NodeConfig) QueryPropStatusTimed(proposalNumber int, desiredStatus string, totalTime chan time.Duration) {
 	start := time.Now()
 	require.Eventually(
 		n.t,

diff --git a/tests/e2e/configurer/current.go b/tests/e2e/configurer/current.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer/chain"
-	"github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer/config"
 	"github.com/osmosis-labs/osmosis/v10/tests/e2e/containers"
 	"github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization"
 )
@@ -46,15 +45,7 @@ func (cb *CurrentBranchConfigurer) ConfigureChain(chainConfig *chain.Config) err
 	}
 	cb.t.Logf("temp directory for chain-id %v: %v", chainConfig.Id, tmpDir)
 
-	numVal := float32(len(chainConfig.ValidatorInitConfigs))
-
-	chainConfig.VotingPeriod = config.PropDepositBlocks + numVal*config.PropVoteBlocks + config.PropBufferBlocks
-	chainConfig.ExpeditedVotingPeriod = config.PropDepositBlocks + numVal*config.PropVoteBlocks + config.PropBufferBlocks - 1
-
-	votingPeriodDuration := time.Duration(chainConfig.VotingPeriod * 1000000000)
-	expeditedVotingPeriodDuration := time.Duration(chainConfig.ExpeditedVotingPeriod * 1000000000)
-
-	initializedChain, err := initialization.InitChain(chainConfig.Id, tmpDir, chainConfig.ValidatorInitConfigs, votingPeriodDuration, expeditedVotingPeriodDuration, 0)
+	initializedChain, err := initialization.InitChain(chainConfig.Id, tmpDir, chainConfig.ValidatorInitConfigs, time.Duration(chainConfig.VotingPeriod*1000000000), time.Duration(chainConfig.ExpeditedVotingPeriod*1000000000), 0)
 	if err != nil {
 		return err
 	}

diff --git a/tests/e2e/configurer/upgrade.go b/tests/e2e/configurer/upgrade.go
@@ -60,10 +60,6 @@ func (uc *UpgradeConfigurer) ConfigureChain(chainConfig *chain.Config) error {
 		return err
 	}
 
-	numVal := float32(len(chainConfig.ValidatorInitConfigs))
-	chainConfig.VotingPeriod = config.PropDepositBlocks + numVal*config.PropVoteBlocks + config.PropBufferBlocks
-	chainConfig.ExpeditedVotingPeriod = config.PropDepositBlocks + numVal*config.PropVoteBlocks + config.PropBufferBlocks - 1
-
 	validatorConfigBytes, err := json.Marshal(chainConfig.ValidatorInitConfigs)
 	if err != nil {
 		return err

diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"sync"
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -159,6 +158,7 @@ func (s *IntegrationTestSuite) TestStateSync() {
 		filepath.Join(runningNode.ConfigDir, "config", "genesis.json"),
 		stateSynchingNodeConfig,
 		time.Duration(chain.VotingPeriod),
+		//time.Duration(chain.ExpeditedVotingPeriod),
 		trustHeight,
 		trustHash,
 		stateSyncRPCServers,
@@ -218,27 +218,25 @@ func (s *IntegrationTestSuite) TestExpeditedProposals() {
 		s.T().Skip("this can be re-enabled post v12")
 	}
 
-	var wg sync.WaitGroup
 	chain := s.configurer.GetChainConfig(0)
 	node, err := chain.GetDefaultNode()
 	s.NoError(err)
 
 	node.SubmitTextProposal("expedited text proposal", sdk.NewCoin(appparams.BaseCoinUnit, sdk.NewInt(config.InitialMinExpeditedDeposit)), true)
 	chain.LatestProposalNumber += 1
 	node.DepositProposal(chain.LatestProposalNumber, true)
-	wg.Add(1)
-	totalTime := make(chan time.Duration, 1)
-	go node.QueryPropStatusTimed(&wg, chain.LatestProposalNumber, "PROPOSAL_STATUS_PASSED", totalTime)
+	totalTimeChan := make(chan time.Duration, 1)
+	go node.QueryPropStatusTimed(chain.LatestProposalNumber, "PROPOSAL_STATUS_PASSED", totalTimeChan)
 	for _, node := range chain.NodeConfigs {
 		node.VoteYesProposal(initialization.ValidatorWalletName, chain.LatestProposalNumber)
 	}
 	// wait till prop status reaches desired pass status
-	wg.Wait()
-	elapsed := <-totalTime
+	elapsed := <-totalTimeChan
 	// compare the time it took to reach pass status to expected expedited voting period
 	expeditedVotingPeriodDuration := time.Duration(chain.ExpeditedVotingPeriod * 1000000000)
 	timeDelta := elapsed - expeditedVotingPeriodDuration
 	// ensure delta is within one second of expected time
 	s.Require().Less(timeDelta, time.Second)
-	close(totalTime)
+	s.T().Logf("expeditedVotingPeriodDuration within one second of expected time: %v", timeDelta)
+	close(totalTimeChan)
 }
diff --git a/x/mint/keeper/keeper_test.go b/x/mint/keeper/keeper_test.go
@@ -339,8 +339,7 @@ func (suite *KeeperTestSuite) TestSetInitialSupplyOffsetDuringMigration() {
 			// in order to ensure the offset is correctly calculated, we need to mint the supply + 1
 			// this is because a negative supply offset will always return zero
 			// by setting this to the supply + 1, we ensure we are correctly calculating the offset by keeping it delta positive
-			supply := bankKeeper.GetSupply(ctx, sdk.DefaultBondDenom)
-			mintKeeper.MintCoins(ctx, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, supply.Amount.Add(sdk.NewInt(1)))))
+			mintKeeper.MintCoins(ctx, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(keeper.DeveloperVestingAmount+1))))
 
 			supplyWithOffsetBefore := bankKeeper.GetSupplyWithOffset(ctx, sdk.DefaultBondDenom)
 			supplyOffsetBefore := bankKeeper.GetSupplyOffset(ctx, sdk.DefaultBondDenom)