From c809296790d6d35d83dfa3061ba0b0de30780660 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Fri, 9 Feb 2024 12:46:23 +0100 Subject: [PATCH] Finish merge --- tests/mbt/driver/core.go | 8 -------- tests/mbt/driver/generate_more_traces.sh | 4 ---- 2 files changed, 12 deletions(-) diff --git a/tests/mbt/driver/core.go b/tests/mbt/driver/core.go index 4da1daeb2d..66413bafe9 100644 --- a/tests/mbt/driver/core.go +++ b/tests/mbt/driver/core.go @@ -375,20 +375,12 @@ func (s *Driver) setTime(chain ChainId, newTime time.Time) { testChain.App.BeginBlock(abcitypes.RequestBeginBlock{Header: testChain.CurrentHeader}) } -<<<<<<< HEAD -func (s *Driver) AssignKey(chain ChainId, valIndex int64, value crypto.PublicKey) error { -======= func (s *Driver) AssignKey(chain ChainId, valIndex int64, key crypto.PublicKey) error { ->>>>>>> feat/partial-set-security stakingVal, found := s.stakingValidator(valIndex) if !found { return fmt.Errorf("validator with id %v not found on provider", valIndex) } -<<<<<<< HEAD - return s.providerKeeper().AssignConsumerKey(s.providerCtx(), string(chain), stakingVal, value) -======= return s.providerKeeper().AssignConsumerKey(s.providerCtx(), string(chain), stakingVal, key) ->>>>>>> feat/partial-set-security } // DeliverPacketToConsumer delivers a packet from the provider to the given consumer recipient. diff --git a/tests/mbt/driver/generate_more_traces.sh b/tests/mbt/driver/generate_more_traces.sh index ef99e525b9..905507a108 100755 --- a/tests/mbt/driver/generate_more_traces.sh +++ b/tests/mbt/driver/generate_more_traces.sh @@ -10,9 +10,5 @@ echo "Generating synced traces with maturations" go run ./... -modelPath=../model/ccv_sync.qnt -init initSync -step stepSync -invariant CanReceiveMaturations -traceFolder traces/sync_mat -numTraces 20 -numSteps 300 -numSamples 20 echo "Generating long synced traces without invariants" go run ./... -modelPath=../model/ccv_sync.qnt -init initSync -step stepSync -traceFolder traces/sync_noinv -numTraces 20 -numSteps 500 -numSamples 1 -<<<<<<< HEAD go run ./... -modelPath=../model/ccv_boundeddrift.qnt --step stepBoundedDriftKeyAssignment --traceFolder traces/bound_key -numTraces 20 -numSteps 100 -numSamples 20 go run ./... -modelPath=../model/ccv_boundeddrift.qnt --step stepBoundedDriftKeyAndPSS --traceFolder traces/bound_pss -numTraces 20 -numSteps 100 -numSamples 20 -======= -go run ./... -modelPath=../model/ccv_boundeddrift.qnt --step stepBoundedDriftKeyAssignment --traceFolder traces/bound_key -numTraces 20 -numSteps 100 -numSamples 20 ->>>>>>> feat/partial-set-security