Skip to content

Commit

Permalink
simplify slinky integration by only allowing out process
Browse files Browse the repository at this point in the history
  • Loading branch information
beer-1 committed Jan 12, 2024
1 parent 441b072 commit c2b8670
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 419 deletions.
39 changes: 13 additions & 26 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ import (
compression "github.com/skip-mev/slinky/abci/strategies/codec"

Check failure on line 158 in app/app.go

View workflow job for this annotation

GitHub Actions / Run test and upload codecov

github.com/skip-mev/[email protected]: invalid version: git ls-remote -q origin in /home/runner/go/pkg/mod/cache/vcs/bc84fe7cc9fb07406a70c924f05a76f3395b71990c1ea2dfd2531129f8d1fd43: exit status 128:
"github.com/skip-mev/slinky/abci/strategies/currencypair"

Check failure on line 159 in app/app.go

View workflow job for this annotation

GitHub Actions / Run test and upload codecov

github.com/skip-mev/[email protected]: invalid version: git ls-remote -q origin in /home/runner/go/pkg/mod/cache/vcs/bc84fe7cc9fb07406a70c924f05a76f3395b71990c1ea2dfd2531129f8d1fd43: exit status 128:
"github.com/skip-mev/slinky/abci/ve"

Check failure on line 160 in app/app.go

View workflow job for this annotation

GitHub Actions / Run test and upload codecov

github.com/skip-mev/[email protected]: invalid version: git ls-remote -q origin in /home/runner/go/pkg/mod/cache/vcs/bc84fe7cc9fb07406a70c924f05a76f3395b71990c1ea2dfd2531129f8d1fd43: exit status 128:
"github.com/skip-mev/slinky/aggregator"
oraclemetrics "github.com/skip-mev/slinky/oracle/metrics"
oracleservice "github.com/skip-mev/slinky/service"
serviceclient "github.com/skip-mev/slinky/service/client"
Expand Down Expand Up @@ -987,41 +986,37 @@ func NewInitiaApp(
panic(err)
}

oracleCfg, metricsCfg := wrappedOracleConfig.GetConfigs()
metrics, consAddress, err := servicemetrics.NewServiceMetricsFromConfig(metricsCfg.AppMetrics)
metrics, consAddress, err := servicemetrics.NewServiceMetricsFromConfig(
wrappedOracleConfig.MetricsConfig.ToAppMetricConfig(),
)
if err != nil {
panic(err)
}

var zapLogger *zap.Logger
if oracleCfg.Production {
if wrappedOracleConfig.Production {
zapLogger, err = zap.NewProduction()
if err != nil {
panic(err)
}
} else {
zapLogger, err = zap.NewDevelopment()
if err != nil {
panic(err)
}
}
if err != nil {
panic(err)
}

app.OracleService, err = serviceclient.NewOracleService(
zapLogger,
oracleCfg,
metricsCfg,
apporacle.DefaultAPIProviderFactory(wrappedOracleConfig),
aggregator.ComputeMedian(),
)
app.OracleService, err = apporacle.NewOracleService(wrappedOracleConfig)
if err != nil {
panic(err)
}

// If app level instrumentation is enabled, then wrap the oracle service with a metrics client
// to get metrics on the oracle service (for ABCI++). This will allow the instrumentation to track
// latency in VerifyVoteExtension requests and more.
if metricsCfg.AppMetrics.Enabled {
if wrappedOracleConfig.MetricsConfig.Enabled {
app.OracleService = serviceclient.NewMetricsClient(app.Logger(), app.OracleService, metrics)
app.OraclePrometheusServer, err = oraclemetrics.NewPrometheusServer(wrappedOracleConfig.MetricsConfig.PrometheusServerAddress, zapLogger)
if err != nil {
panic(err)
}
}

app.oraclePreBlockHandler = oraclepreblock.NewOraclePreBlockHandler(
Expand Down Expand Up @@ -1057,14 +1052,6 @@ func NewInitiaApp(
app.SetExtendVoteHandler(voteExtensionsHandler.ExtendVoteHandler())
app.SetVerifyVoteExtensionHandler(voteExtensionsHandler.VerifyVoteExtensionHandler())

// start the prometheus server if required
if metricsCfg.AppMetrics.Enabled || metricsCfg.OracleMetrics.Enabled {
app.OraclePrometheusServer, err = oraclemetrics.NewPrometheusServer(metricsCfg.PrometheusServerAddress, zapLogger)
if err != nil {
panic(err)
}
}

//////////////////
/// oracle end ///
//////////////////
Expand Down
33 changes: 0 additions & 33 deletions app/oracle/coinbase.go

This file was deleted.

56 changes: 0 additions & 56 deletions app/oracle/coingecko.go

This file was deleted.

Loading

0 comments on commit c2b8670

Please sign in to comment.