Skip to content

Commit

Permalink
Finish merge
Browse files Browse the repository at this point in the history
  • Loading branch information
p-offtermatt committed Feb 9, 2024
1 parent 77446eb commit c809296
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
8 changes: 0 additions & 8 deletions tests/mbt/driver/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions tests/mbt/driver/generate_more_traces.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c809296

Please sign in to comment.