diff --git a/plutus-pab/app/Cli.hs b/plutus-pab/app/Cli.hs index 751e9cbfd80..70d9598fb18 100644 --- a/plutus-pab/app/Cli.hs +++ b/plutus-pab/app/Cli.hs @@ -95,7 +95,7 @@ import qualified Plutus.PAB.Db.Beam as Beam import qualified Plutus.PAB.Db.Eventful as Eventful import Plutus.PAB.Effects.Contract.ContractExe (ContractExe) import qualified Plutus.PAB.Monitoring.Monitoring as LM -import Plutus.PAB.Types (Config (..), DbConfig (..), DbKind (..), chainIndexConfig, +import Plutus.PAB.Types (Config (..), DbConfig (..), chainIndexConfig, metadataServerConfig, nodeServerConfig, walletServerConfig) import qualified Plutus.PAB.Webserver.Server as PABServer import Plutus.PAB.Webserver.Types (ContractActivationArgs (..)) @@ -108,7 +108,7 @@ runNoConfigCommand trace = \case -- Run database migration Migrate{dbPath} -> - let conf = DbConfig{dbConfigPoolSize=10, dbConfigFile=Text.pack dbPath, dbConfigDbKind=BeamDb} in + let conf = DbConfig{dbConfigPoolSize=10, dbConfigFile=Text.pack dbPath} in App.beamMigrate (LM.convertLog LM.PABMsg trace) conf -- TODO: Restore or delete -- App.migrate (LM.convertLog LM.PABMsg trace) conf @@ -194,19 +194,19 @@ runConfigCommand ConfigCommandArgs{ccaTrace, ccaPABConfig=Config {nodeServerConf -- Install a contract runConfigCommand ConfigCommandArgs{ccaTrace, ccaPABConfig=Config{dbConfig}} (InstallContract contractExe) = - case dbConfigDbKind dbConfig of - BeamDb -> + -- case dbConfigDbKind dbConfig of + -- BeamDb -> do connection <- App.beamDbConnect (LM.convertLog LM.PABMsg ccaTrace) dbConfig fmap (either (error . show) id) $ Beam.runBeamStoreAction connection $ Contract.addDefinition @ContractExe contractExe - EventfulDb -> - do - connection <- Sqlite <$> App.dbConnect (LM.convertLog LM.PABMsg ccaTrace) dbConfig - fmap (either (error . show) id) - $ Eventful.runEventfulStoreAction connection (LM.convertLog (LM.PABMsg . LM.SLoggerBridge) ccaTrace) - $ Contract.addDefinition @ContractExe contractExe + -- EventfulDb -> + -- do + -- connection <- Sqlite <$> App.dbConnect (LM.convertLog LM.PABMsg ccaTrace) dbConfig + -- fmap (either (error . show) id) + -- $ Eventful.runEventfulStoreAction connection (LM.convertLog (LM.PABMsg . LM.SLoggerBridge) ccaTrace) + -- $ Contract.addDefinition @ContractExe contractExe -- Get the state of a contract runConfigCommand ConfigCommandArgs{ccaTrace, ccaPABConfig=Config{dbConfig}} (ContractState contractInstanceId) = do diff --git a/plutus-pab/plutus-pab.yaml b/plutus-pab/plutus-pab.yaml index f535ecdbfe2..6ae34e94c2c 100644 --- a/plutus-pab/plutus-pab.yaml +++ b/plutus-pab/plutus-pab.yaml @@ -1,7 +1,6 @@ dbConfig: dbConfigFile: pab-core.db dbConfigPoolSize: 20 - dbConfigDbKind: BeamDb pabWebserverConfig: baseUrl: http://localhost:9080 diff --git a/plutus-pab/src/Plutus/PAB/Types.hs b/plutus-pab/src/Plutus/PAB/Types.hs index 6c4431b497e..1825d43dc86 100644 --- a/plutus-pab/src/Plutus/PAB/Types.hs +++ b/plutus-pab/src/Plutus/PAB/Types.hs @@ -81,17 +81,10 @@ data DbConfig = -- ^ The path to the sqlite database file. May be absolute or relative. , dbConfigPoolSize :: Int -- ^ Max number of concurrent sqlite database connections. - , dbConfigDbKind :: DbKind - -- ^ The particular kind of database we're using; see 'DbKind'. } deriving (Show, Eq, Generic) deriving anyclass (ToJSON, FromJSON) -data DbKind - = BeamDb - | EventfulDb - deriving (Generic, Show, Eq, FromJSON, ToJSON) - data Config = Config { dbConfig :: DbConfig