diff --git a/components/metrics/collector/metric.go b/components/metrics/collector/metric.go index 4ea8e0adc..1696b8d80 100644 --- a/components/metrics/collector/metric.go +++ b/components/metrics/collector/metric.go @@ -198,7 +198,7 @@ func (m *Metric) schedulePruning(labelValues []string) { func (m *Metric) shutdown() { if m.pruningExecutor != nil { - m.pruningExecutor.Shutdown() + m.pruningExecutor.Shutdown(timed.CancelPendingElements) } } diff --git a/tools/docker-network/run.sh b/tools/docker-network/run.sh index 6cac8241e..323a6bdbb 100755 --- a/tools/docker-network/run.sh +++ b/tools/docker-network/run.sh @@ -1,17 +1,16 @@ #!/bin/bash -set -e + # Create a function to join an array of strings by a given character function join { local IFS="$1"; shift; echo "$*"; } # All parameters can be optional now, just make sure we don't have too many -if [[ $# -gt 4 ]] ; then - echo 'Call with ./run [replicas=1|2|3|...] [monitoring=0|1] [feature=0|1]' +if [[ $# -gt 2 ]] ; then + echo 'Call with ./run.sh [monitoring=0|1]' exit 0 fi -REPLICAS=${1:-1} -MONITORING=${2:-0} +MONITORING=${1:-0} export DOCKER_BUILDKIT=1 export COMPOSE_DOCKER_CLI_BUILD=1 diff --git a/tools/genesis-snapshot/presets/presets.go b/tools/genesis-snapshot/presets/presets.go index 29babde9f..315aebac9 100644 --- a/tools/genesis-snapshot/presets/presets.go +++ b/tools/genesis-snapshot/presets/presets.go @@ -244,7 +244,7 @@ var Feature = []options.Option[snapshotcreator.Options]{ iotago.NewV3ProtocolParameters( iotago.WithNetworkOptions("feature", "rms"), iotago.WithSupplyOptions(4_600_000_000_000_000, 100, 1, 10, 100, 100, 100), - iotago.WithTimeProviderOptions(1697631694, 10, 13), + iotago.WithTimeProviderOptions(time.Now().Unix(), 10, 13), iotago.WithLivenessOptions(30, 30, 10, 20, 30), // increase/decrease threshold = fraction * slotDurationInSeconds * schedulerRate iotago.WithCongestionControlOptions(500, 500, 500, 800000, 500000, 100000, 1000, 100),