From 96d60f512a6c9fcb51e045e4fa73fd7b13042e95 Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Thu, 1 Aug 2024 11:36:03 +1000 Subject: [PATCH 1/3] Invert `--no-fallback-simplify` and `--no-post-exec-simplify` (new default: no simplification) * Introduces options `--fallback-simplify` and `--post-exec-simplify` to perform said simplifications (before fallbacks and after execute) in `kore-rpc-booster` * The old `--no-fallback-simplify` and `--no-post-exec-simplify` options are still accepted but not doing anything any more. --- booster/tools/booster/Server.hs | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/booster/tools/booster/Server.hs b/booster/tools/booster/Server.hs index a9ab9979ee..5c93bfc2d7 100644 --- a/booster/tools/booster/Server.hs +++ b/booster/tools/booster/Server.hs @@ -404,6 +404,7 @@ data CLProxyOptions = CLProxyOptions { clOptions :: CLOptions , proxyOptions :: ProxyOptions } + deriving stock (Show) data ProxyOptions = ProxyOptions { forceFallback :: Maybe Depth @@ -417,6 +418,7 @@ data ProxyOptions = ProxyOptions , simplifyBeforeFallback :: Bool -- ^ whether to run a simplification before fall-back execute requests } + deriving stock (Show) parserInfoModifiers :: InfoMod options parserInfoModifiers = @@ -454,17 +456,23 @@ clProxyOptionsParser = <> help "Halt reasons for which requests should be re-executed with kore-rpc" <> showDefaultWith (intercalate "," . map show) ) - <*> flag - True - False - ( long "no-post-exec-simplify" - <> help "disable post-exec simplification" + <*> ( switch (long "post-exec-simplify" <> help "simplify after execution") + <|> ( flag + True + False + ( long "no-post-exec-simplify" + <> help "Deprecated: used to disable post-exec simplification (which is now the default)" + ) + ) ) - <*> flag - True - False - ( long "no-fallback-simplify" - <> help "disable simplification before fallback requests" + <*> ( switch (long "fallback-simplify" <> help "run a simplification before fallback requests") + <|> ( flag + True + False + ( long "no-fallback-simplify" + <> help "Deprecated: used to disable simplification before fallback requests (now the default)" + ) + ) ) reasonReader :: String -> Either String HaltReason From 56690408b8567ab3f668cbf0130b043fc8e2ecd2 Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Thu, 1 Aug 2024 13:56:41 +1000 Subject: [PATCH 2/3] modified test expectations. TO DISCUSS --- .../test-3934-smt/response-008.json | 4404 +++++++++-------- .../test-collectiontest/response-from-12.json | 20 +- .../response-infeasible-branching.json | 50 +- .../test-logTiming/response-c.json | 8 - .../response-concrete-substitution.json | 48 +- .../response-symbolic-bottom-predicate.json | 334 +- .../response-symbolic-substitution.json | 44 +- .../response-symbolic-two-substitutions.json | 24 +- .../response-vacuous-but-rewritten.json | 284 +- .../response-vacuous-var-at-branch.json | 48 +- .../response-vacuous-without-rewrite.json | 284 +- scripts/booster-integration-tests.sh | 6 +- 12 files changed, 2904 insertions(+), 2650 deletions(-) diff --git a/booster/test/rpc-integration/test-3934-smt/response-008.json b/booster/test/rpc-integration/test-3934-smt/response-008.json index 98e9dca69e..7b9edb7ba9 100644 --- a/booster/test/rpc-integration/test-3934-smt/response-008.json +++ b/booster/test/rpc-integration/test-3934-smt/response-008.json @@ -9,62 +9,112 @@ "format": "KORE", "version": 1, "term": { - "tag": "App", - "name": "Lbl'-LT-'generatedTop'-GT-'", - "sorts": [], - "args": [ + "tag": "And", + "sort": { + "tag": "SortApp", + "name": "SortGeneratedTopCell", + "args": [] + }, + "patterns": [ { "tag": "App", - "name": "Lbl'-LT-'kevm'-GT-'", + "name": "Lbl'-LT-'generatedTop'-GT-'", "sorts": [], "args": [ { "tag": "App", - "name": "Lbl'-LT-'k'-GT-'", + "name": "Lbl'-LT-'kevm'-GT-'", "sorts": [], "args": [ { "tag": "App", - "name": "kseq", + "name": "Lbl'-LT-'k'-GT-'", "sorts": [], "args": [ { "tag": "App", - "name": "inj", - "sorts": [ - { - "tag": "SortApp", - "name": "SortInt", - "args": [] - }, - { - "tag": "SortApp", - "name": "SortKItem", - "args": [] - } - ], + "name": "kseq", + "sorts": [], "args": [ { "tag": "App", - "name": "Lbl'Unds'-Int'Unds'", - "sorts": [], + "name": "inj", + "sorts": [ + { + "tag": "SortApp", + "name": "SortInt", + "args": [] + }, + { + "tag": "SortApp", + "name": "SortKItem", + "args": [] + } + ], "args": [ { "tag": "App", - "name": "LblCmem'LParUndsCommUndsRParUnds'GAS-FEES'Unds'Int'Unds'Schedule'Unds'Int", + "name": "Lbl'Unds'-Int'Unds'", "sorts": [], "args": [ { "tag": "App", - "name": "LblLONDON'Unds'EVM", + "name": "LblCmem'LParUndsCommUndsRParUnds'GAS-FEES'Unds'Int'Unds'Schedule'Unds'Int", "sorts": [], - "args": [] + "args": [ + { + "tag": "App", + "name": "LblLONDON'Unds'EVM", + "sorts": [], + "args": [] + }, + { + "tag": "App", + "name": "Lbl'Hash'memoryUsageUpdate'LParUndsCommUndsCommUndsRParUnds'EVM'Unds'Int'Unds'Int'Unds'Int'Unds'Int", + "sorts": [], + "args": [ + { + "tag": "EVar", + "name": "VarMEMORYUSED'Unds'CELL", + "sort": { + "tag": "SortApp", + "name": "SortInt", + "args": [] + } + }, + { + "tag": "DV", + "sort": { + "tag": "SortApp", + "name": "SortInt", + "args": [] + }, + "value": "64" + }, + { + "tag": "DV", + "sort": { + "tag": "SortApp", + "name": "SortInt", + "args": [] + }, + "value": "32" + } + ] + } + ] }, { "tag": "App", - "name": "Lbl'Hash'memoryUsageUpdate'LParUndsCommUndsCommUndsRParUnds'EVM'Unds'Int'Unds'Int'Unds'Int'Unds'Int", + "name": "LblCmem'LParUndsCommUndsRParUnds'GAS-FEES'Unds'Int'Unds'Schedule'Unds'Int", "sorts": [], "args": [ + { + "tag": "App", + "name": "LblLONDON'Unds'EVM", + "sorts": [], + "args": [] + }, { "tag": "EVar", "name": "VarMEMORYUSED'Unds'CELL", @@ -73,81 +123,10 @@ "name": "SortInt", "args": [] } - }, - { - "tag": "DV", - "sort": { - "tag": "SortApp", - "name": "SortInt", - "args": [] - }, - "value": "64" - }, - { - "tag": "DV", - "sort": { - "tag": "SortApp", - "name": "SortInt", - "args": [] - }, - "value": "32" } ] } ] - }, - { - "tag": "App", - "name": "LblCmem'LParUndsCommUndsRParUnds'GAS-FEES'Unds'Int'Unds'Schedule'Unds'Int", - "sorts": [], - "args": [ - { - "tag": "App", - "name": "LblLONDON'Unds'EVM", - "sorts": [], - "args": [] - }, - { - "tag": "EVar", - "name": "VarMEMORYUSED'Unds'CELL", - "sort": { - "tag": "SortApp", - "name": "SortInt", - "args": [] - } - } - ] - } - ] - } - ] - }, - { - "tag": "App", - "name": "kseq", - "sorts": [], - "args": [ - { - "tag": "App", - "name": "inj", - "sorts": [ - { - "tag": "SortApp", - "name": "SortInternalOp", - "args": [] - }, - { - "tag": "SortApp", - "name": "SortKItem", - "args": [] - } - ], - "args": [ - { - "tag": "App", - "name": "Lbl'Hash'deductGas'Unds'EVM'Unds'InternalOp", - "sorts": [], - "args": [] } ] }, @@ -174,50 +153,9 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'gas'LSqBUndsRSqBUnds'EVM'Unds'InternalOp'Unds'OpCode", + "name": "Lbl'Hash'deductGas'Unds'EVM'Unds'InternalOp", "sorts": [], - "args": [ - { - "tag": "App", - "name": "inj", - "sorts": [ - { - "tag": "SortApp", - "name": "SortInternalOp", - "args": [] - }, - { - "tag": "SortApp", - "name": "SortOpCode", - "args": [] - } - ], - "args": [ - { - "tag": "App", - "name": "Lbl'UndsUndsUnds'EVM'Unds'InternalOp'Unds'UnStackOp'Unds'Int", - "sorts": [], - "args": [ - { - "tag": "App", - "name": "LblMLOAD'Unds'EVM'Unds'UnStackOp", - "sorts": [], - "args": [] - }, - { - "tag": "DV", - "sort": { - "tag": "SortApp", - "name": "SortInt", - "args": [] - }, - "value": "64" - } - ] - } - ] - } - ] + "args": [] } ] }, @@ -244,33 +182,9 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'access'LSqBUndsCommUndsRSqBUnds'EVM'Unds'InternalOp'Unds'OpCode'Unds'OpCode", + "name": "Lbl'Hash'gas'LSqBUndsRSqBUnds'EVM'Unds'InternalOp'Unds'OpCode", "sorts": [], "args": [ - { - "tag": "App", - "name": "inj", - "sorts": [ - { - "tag": "SortApp", - "name": "SortUnStackOp", - "args": [] - }, - { - "tag": "SortApp", - "name": "SortOpCode", - "args": [] - } - ], - "args": [ - { - "tag": "App", - "name": "LblMLOAD'Unds'EVM'Unds'UnStackOp", - "sorts": [], - "args": [] - } - ] - }, { "tag": "App", "name": "inj", @@ -338,23 +252,72 @@ "args": [ { "tag": "App", - "name": "Lbl'UndsUndsUnds'EVM'Unds'InternalOp'Unds'UnStackOp'Unds'Int", + "name": "Lbl'Hash'access'LSqBUndsCommUndsRSqBUnds'EVM'Unds'InternalOp'Unds'OpCode'Unds'OpCode", "sorts": [], "args": [ { "tag": "App", - "name": "LblMLOAD'Unds'EVM'Unds'UnStackOp", - "sorts": [], - "args": [] + "name": "inj", + "sorts": [ + { + "tag": "SortApp", + "name": "SortUnStackOp", + "args": [] + }, + { + "tag": "SortApp", + "name": "SortOpCode", + "args": [] + } + ], + "args": [ + { + "tag": "App", + "name": "LblMLOAD'Unds'EVM'Unds'UnStackOp", + "sorts": [], + "args": [] + } + ] }, { - "tag": "DV", - "sort": { - "tag": "SortApp", - "name": "SortInt", - "args": [] - }, - "value": "64" + "tag": "App", + "name": "inj", + "sorts": [ + { + "tag": "SortApp", + "name": "SortInternalOp", + "args": [] + }, + { + "tag": "SortApp", + "name": "SortOpCode", + "args": [] + } + ], + "args": [ + { + "tag": "App", + "name": "Lbl'UndsUndsUnds'EVM'Unds'InternalOp'Unds'UnStackOp'Unds'Int", + "sorts": [], + "args": [ + { + "tag": "App", + "name": "LblMLOAD'Unds'EVM'Unds'UnStackOp", + "sorts": [], + "args": [] + }, + { + "tag": "DV", + "sort": { + "tag": "SortApp", + "name": "SortInt", + "args": [] + }, + "value": "64" + } + ] + } + ] } ] } @@ -383,32 +346,23 @@ "args": [ { "tag": "App", - "name": "Lblpc", + "name": "Lbl'UndsUndsUnds'EVM'Unds'InternalOp'Unds'UnStackOp'Unds'Int", "sorts": [], "args": [ { "tag": "App", - "name": "inj", - "sorts": [ - { - "tag": "SortApp", - "name": "SortUnStackOp", - "args": [] - }, - { - "tag": "SortApp", - "name": "SortOpCode", - "args": [] - } - ], - "args": [ - { - "tag": "App", - "name": "LblMLOAD'Unds'EVM'Unds'UnStackOp", - "sorts": [], - "args": [] - } - ] + "name": "LblMLOAD'Unds'EVM'Unds'UnStackOp", + "sorts": [], + "args": [] + }, + { + "tag": "DV", + "sort": { + "tag": "SortApp", + "name": "SortInt", + "args": [] + }, + "value": "64" } ] } @@ -421,18 +375,74 @@ "args": [ { "tag": "App", - "name": "Lblexecute", - "sorts": [], - "args": [] + "name": "inj", + "sorts": [ + { + "tag": "SortApp", + "name": "SortInternalOp", + "args": [] + }, + { + "tag": "SortApp", + "name": "SortKItem", + "args": [] + } + ], + "args": [ + { + "tag": "App", + "name": "Lblpc", + "sorts": [], + "args": [ + { + "tag": "App", + "name": "inj", + "sorts": [ + { + "tag": "SortApp", + "name": "SortUnStackOp", + "args": [] + }, + { + "tag": "SortApp", + "name": "SortOpCode", + "args": [] + } + ], + "args": [ + { + "tag": "App", + "name": "LblMLOAD'Unds'EVM'Unds'UnStackOp", + "sorts": [], + "args": [] + } + ] + } + ] + } + ] }, { - "tag": "EVar", - "name": "VarK'Unds'CELL'Unds'de090c3b", - "sort": { - "tag": "SortApp", - "name": "SortK", - "args": [] - } + "tag": "App", + "name": "kseq", + "sorts": [], + "args": [ + { + "tag": "App", + "name": "Lblexecute", + "sorts": [], + "args": [] + }, + { + "tag": "EVar", + "name": "VarK'Unds'CELL'Unds'de090c3b", + "sort": { + "tag": "SortApp", + "name": "SortK", + "args": [] + } + } + ] } ] } @@ -447,205 +457,118 @@ ] } ] - } - ] - }, - { - "tag": "App", - "name": "Lbl'-LT-'exit-code'-GT-'", - "sorts": [], - "args": [ - { - "tag": "EVar", - "name": "VarEXITCODE'Unds'CELL", - "sort": { - "tag": "SortApp", - "name": "SortInt", - "args": [] - } - } - ] - }, - { - "tag": "App", - "name": "Lbl'-LT-'mode'-GT-'", - "sorts": [], - "args": [ - { - "tag": "App", - "name": "LblNORMAL", - "sorts": [], - "args": [] - } - ] - }, - { - "tag": "App", - "name": "Lbl'-LT-'schedule'-GT-'", - "sorts": [], - "args": [ + }, { "tag": "App", - "name": "LblLONDON'Unds'EVM", + "name": "Lbl'-LT-'exit-code'-GT-'", "sorts": [], - "args": [] - } - ] - }, - { - "tag": "App", - "name": "Lbl'-LT-'useGas'-GT-'", - "sorts": [], - "args": [ - { - "tag": "DV", - "sort": { - "tag": "SortApp", - "name": "SortBool", - "args": [] - }, - "value": "true" - } - ] - }, - { - "tag": "App", - "name": "Lbl'-LT-'ethereum'-GT-'", - "sorts": [], - "args": [ + "args": [ + { + "tag": "EVar", + "name": "VarEXITCODE'Unds'CELL", + "sort": { + "tag": "SortApp", + "name": "SortInt", + "args": [] + } + } + ] + }, { "tag": "App", - "name": "Lbl'-LT-'evm'-GT-'", + "name": "Lbl'-LT-'mode'-GT-'", "sorts": [], "args": [ { "tag": "App", - "name": "Lbl'-LT-'output'-GT-'", - "sorts": [], - "args": [ - { - "tag": "EVar", - "name": "VarOUTPUT'Unds'CELL", - "sort": { - "tag": "SortApp", - "name": "SortBytes", - "args": [] - } - } - ] - }, - { - "tag": "App", - "name": "Lbl'-LT-'statusCode'-GT-'", - "sorts": [], - "args": [ - { - "tag": "EVar", - "name": "VarSTATUSCODE'Unds'CELL", - "sort": { - "tag": "SortApp", - "name": "SortStatusCode", - "args": [] - } - } - ] - }, - { - "tag": "App", - "name": "Lbl'-LT-'callStack'-GT-'", + "name": "LblNORMAL", "sorts": [], - "args": [ - { - "tag": "EVar", - "name": "VarCALLSTACK'Unds'CELL", - "sort": { - "tag": "SortApp", - "name": "SortList", - "args": [] - } - } - ] - }, + "args": [] + } + ] + }, + { + "tag": "App", + "name": "Lbl'-LT-'schedule'-GT-'", + "sorts": [], + "args": [ { "tag": "App", - "name": "Lbl'-LT-'interimStates'-GT-'", + "name": "LblLONDON'Unds'EVM", "sorts": [], - "args": [ - { - "tag": "EVar", - "name": "VarINTERIMSTATES'Unds'CELL", - "sort": { - "tag": "SortApp", - "name": "SortList", - "args": [] - } - } - ] - }, + "args": [] + } + ] + }, + { + "tag": "App", + "name": "Lbl'-LT-'useGas'-GT-'", + "sorts": [], + "args": [ { - "tag": "App", - "name": "Lbl'-LT-'touchedAccounts'-GT-'", - "sorts": [], - "args": [ - { - "tag": "EVar", - "name": "VarTOUCHEDACCOUNTS'Unds'CELL", - "sort": { - "tag": "SortApp", - "name": "SortSet", - "args": [] - } - } - ] - }, + "tag": "DV", + "sort": { + "tag": "SortApp", + "name": "SortBool", + "args": [] + }, + "value": "true" + } + ] + }, + { + "tag": "App", + "name": "Lbl'-LT-'ethereum'-GT-'", + "sorts": [], + "args": [ { "tag": "App", - "name": "Lbl'-LT-'callState'-GT-'", + "name": "Lbl'-LT-'evm'-GT-'", "sorts": [], "args": [ { "tag": "App", - "name": "Lbl'-LT-'program'-GT-'", + "name": "Lbl'-LT-'output'-GT-'", "sorts": [], "args": [ { - "tag": "DV", + "tag": "EVar", + "name": "VarOUTPUT'Unds'CELL", "sort": { "tag": "SortApp", "name": "SortBytes", "args": [] - }, - "value": "`€`@R4€\u0015a\u0000\u0010W`\u0000€ý[P`\u00046\u0010a\u0001,W`\u00005`à\u001c€c]â/\u0007\u0011a\u0000­W€c¡\u0018á\u0002\u0011a\u0000qW€c¡\u0018á\u0002\u0014a\u0002bW€cºAO¦\u0014a\u0002uW€cÓ\u0013”\r\u0014a\u0002W€cøÌ¿G\u0014a\u0002 W€cúv&Ô\u0014a\u0002³W`\u0000€ý[€c]â/\u0007\u0014a\u0002\u0003W€cm]9ß\u0014a\u0002\u0016W€c~Ž#Ð\u0014a\u0002)W€cˆ~OÛ\u0014a\u0002=`\u0000ý[PPPP`\u0000`\u0002‚`\u0001a\u0004‘a\u0013eV[a\u0004™„a\u0013}V[a\u0004£‘a\u00138V[P`\u0000a\u0004°ƒa\u000c`V[Pa\u0003\u0014‚‚a\u000c’V[`\u0000a\u0004ǂa\rqV[P`\u0001`\u0000[ƒQ\u0010€\u0015a\u0004ÛWP[\u0015a\u0005\u0012WƒQ\u0010a\u0004òWa\u0004òa\u0013œV[` \u0002` \u0001\u0001Qƒ\u0010\u0015‘P€€a\u0005\na\u0013LV[‘PPa\u0004ÎV[Pa\u0003\u0014a\t›V[`\u0000a\u0003&`da\u0005‰V[`\u0000a\u00053‚a\rÐV[P`\u0001`\u0000[ƒQ\u0010€\u0015a\u0005GWP[\u0015a\u0005\u0012WƒQ\u0010a\u0005^Wa\u0005^a\u0013œV[` \u0002` \u0001\u0001Qƒ\u0010\u0015‘P€€a\u0005va\u0013LV[‘PPa\u0005:V[`\u0000a\u0002˃a\u000e.V[`@Qc&1ò±`á\u001bRf¸\u0017\u0002à\\\u000bo‚\u0011\u0015`\u0004‚\u0001R`\u0000sq\tpžÏ©\u001a€boó˜hö[\u001dÑ-cLcåb`$\u0001`\u0000`@Q€ƒ\u0003`\u0000‡€;\u0015€\u0015a\u0005âW`\u0000€ý[PZñ\u0015€\u0015a\u0005öW=`\u0000€>=`\u0000ý[PPPP`\u0000[‚\u0015a\u0006!Wa\u0006\rƒ‚a\u0013eV[Pa\u0006\u001a`\u0001„a\u0013!V[’Pa\u0005ýV[’‘PPV[`@Qc&1ò±`á\u001bR`d‚\u0011\u0015`\u0004‚\u0001Rsq\tpžÏ©\u001a€boó˜hö[\u001dÑ-cLcåb`$\u0001`\u0000`@Q€ƒ\u0003`\u0000‡€;\u0015€\u0015a\u0006wW`\u0000€ý[PZñ\u0015€\u0015a\u0006‹W=`\u0000€>=`\u0000ý[PPPP`\u0000`\u0002‚`\u0001a\u0006 ‘a\u0013eV[a\u0006ª„a\u0013}V[a\u0006´‘a\u00138V[P`\u0000a\u0004°ƒa\u000eeV[`\u0000a\u0006̂a\u000eV[P`\u0001€[‚Q\u0010€\u0015a\u0006ßWP[\u0015a\u0005\u0012WƒQ\u0010a\u0006öWa\u0006öa\u0013œV[` \u0002` \u0001\u0001Q„`\u0001ƒa\u0007\u000c‘a\u0013!V[Q\u0010a\u0007\u001cWa\u0007\u001ca\u0013œV[` \u0002` \u0001\u0001Q\u0011\u0015‘P€€a\u00073a\u0013LV[‘PPa\u0006ÒV[`\u0000a\u0007Fƒa\u000e»V[P‚`\u0000\u0003a\u0007[Wa\u0003\u0014`\u0000a\u000c’V[a\u0007ga\u0002݂a\tJV[`\u0000a\u0007|a\u0007w`\u0001†a\u0013!V[a\u000e»V[Pa\u0003ƒ„\u0011\u0015€a\u0007WP‚„\u0010\u0015[€a\u0002ÝWPa\u0007Ÿ„a\tJV[\u0015a\t›V[`\u0000€Ta\u0001\u0000\u0004`ÿ\u0016\u0015a\u0007ÅWP`\u0000Ta\u0001\u0000\u0004`ÿ\u0016V[`\u0000sq\tpžÏ©\u001a€boó˜hö[\u001dÑ-;\u0015a\u0008ËW`@€Qsq\tpžÏ©\u001a€boó˜hö[\u001dÑ-` ‚\u0001Re\u0019˜Z[\u0019Y`Ò\u001b‚„\u0001R‚Q€ƒ\u0003„\u0001R``ƒ\u0001“R`\u0000’‘a\u0008S‘fpÊA\u001dpêÕ\r\\\"\u0007\r¯Ãj×_=Ï^r7²*ޚìđ`€\u0001a\u0013ÞV[`@€Q`\u001f\u0019„\u0003\u0001R‚Ra\u0008m‘a\u0014\u000fV[`\u0000`@Q€ƒ\u0003`\u0000†Zñ‘PP=€`\u0000\u0014a\u0008ªW`@Q‘P`\u001f\u0019`?=\u0001\u0016‚\u0001`@R=‚R=`\u0000` „\u0001>a\u0008¯V[``‘P[P‘PP€€` \u0001Q\u0001a\u0008Ǒa\u0014+V[‘PP[‘PV[`\u0000a\u0008ۂa\u000eõV[P`\u0001€[‚Q\u0010€\u0015a\u0008îWP[\u0015a\u0005\u0012WƒQ\u0010a\t\u0005Wa\t\u0005a\u0013œV[` \u0002` \u0001\u0001Q„`\u0001ƒa\t\u001b‘a\u0013!V[Q\u0010a\t+Wa\t+a\u0013œV[` \u0002` \u0001\u0001Q\u0011\u0015‘P€€a\tBa\u0013LV[‘PPa\u0008áV[`\u0000`\u0002‚\u0010\u0015a\t]WP`\u0000‘PV[`\u0002[‚\u0010\u0015a\t’Wa\tr„a\u0012÷V[\u0015a\t€WP`\u0000’‘PPV[€a\tŠa\u0013LV[‘PPa\t`V[P`\u0001’‘PPV[€a\u0003£WA0O¬Ù2=u±\u001bÍÖ\tË8ïÿý°W\u0010÷Êðé±lmpŸP`@Qa\tÿ` €‚R`\u0017‚\u0001RError: Assertion Failed\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000`@‚\u0001R``\u0001V[`@Q€‘\u0003¡a\u0003£a\u000f\u0017V[`\u0000`\u0000\u0003a\n!WP`\u0000‘PV[[€‘P`\u0002a\n3…„a\u0010#V[a\n=‘a\u0013eV[a\nG‘a\u00138V[P\u0003a\n#W[P‘PV[`\u0000g\rඳ§d\u0000\u0000a\nm`\u0002‚a\u00138V[a\nw„†a\u0013}V[a\n‘a\u0013eV[a\n‹‘a\u00138V[“’PPPV[`\u0000`\u0002‚\u0010\u0015a\n¥WP`\u0000‘PV[`\u0002[a\n³`\u0002„a\u00138V[\u0011a\t’Wa\nÁ„a\u0012÷V[\u0015a\nÑWP`\u0000’‘PPV[€a\nہa\u0013LV[‘PPa\n¨V[€\u0015\u0015‚\u0015\u0015\u0014a\u0004\u0006WA0O¬Ù2=u±\u001bÍÖ\tË8ïÿý°W\u0010÷Êðé±lmpŸP`@Qa\u000bX` €‚R`\"‚\u0001RError: a == b not satisfied [boo`@‚\u0001Ral]`ð\u001b``‚\u0001R`€\u0001V[`@Q€‘\u0003¡(\u000fDF²Š\u0013rA}Úe0¹[)’±*ÉÇóxS_)©zÏ5ƒa\u000b©W`@Q€`@\u0001`@R€`\u0005R` \u0001dfalse`Ø\u001bRPa\u000bÇV[`@Q€`@\u0001`@R€`\u0004R` \u0001ctrue`à\u001bRP[`@Qa\u000bԑa\u0014yV[`@Q€‘\u0003¡(\u000fDF²Š\u0013rA}Úe0¹[)’±*ÉÇóxS_)©zÏ5ƒ‚a\u000c%W`@Q€`@\u0001`@R€`\u0005R` \u0001dfalse`Ø\u001bRPa\u000cCV[`@Q€`@\u0001`@R€`\u0004R` \u0001ctrue`à\u001bRP[`@Qa\u000cP‘a\u0014½V[`@Q€‘\u0003¡a\u0004\u0006a\u000f\u0017V[`\u0000€€[ƒ\u0010\u0015a\u000c‹Wa\u000cwƒa\u0013eV[‘P€a\u000cƒa\u0013LV[‘PPa\u000ceV[P’‘PPV[€‚\u0014a\u0004\u0006WA0O¬Ù2=u±\u001bÍÖ\tË8ïÿý°W\u0010÷Êðé±lmpŸP`@Qa\r\u0003` €‚R`\"‚\u0001RError: a == b not satisfied [uin`@‚\u0001Rat]`ð\u001b``‚\u0001R`€\u0001V[`@Q€‘\u0003¡²Þ/¾€\u001a\röÀËÝýD‹£Ä\u001dH @Ê5Ål–ï\u000fÊç!¨`@Qa\r:‘a\u0014çV[`@Q€‘\u0003¡²Þ/¾€\u001a\röÀËÝýD‹£Ä\u001dH @Ê5Ål–ï\u000fÊç!¨‚`@Qa\u000cP‘a\u0015\u001fV[`\u0000€`\u0001[ƒQ\u0010\u0015a\u000c‹W„‚Q\u0010a\r“Wa\r“a\u0013œV[` \u0002` \u0001\u0001Q\u0011\u0015a\r¾WƒQ\u0010a\r³Wa\r³a\u0013œV[` \u0002` \u0001\u0001Q‘P[€a\rȁa\u0013LV[‘PPa\rwV[`\u0000€€[ƒQ\u0010\u0015a\u000c‹W„‚Q\u0010a\rñWa\rña\u0013œV[` \u0002` \u0001\u0001Q\u0011\u0015a\u000e\u001cWƒQ\u0010a\u000e\u0011Wa\u000e\u0011a\u0013œV[` \u0002` \u0001\u0001Q‘P[€a\u000e&a\u0013LV[‘PPa\rÕV[`\u0000`\u0002[‚\u0010\u0015a\t’Wa\u000eE„a\u0012÷V[\u0015a\u000eSWP`\u0000’‘PPV[€a\u000e]a\u0013LV[‘PPa\u000e3V[`\u0000€€[ƒ\u0011a\u000c‹Wa\u000e{ƒa\u0013eV[‘P€a\u000e‡a\u0013LV[‘PPa\u000ejV[```\u0001‚Q\u0011a\u000ežWPV[a\u000e·‚`\u0000`\u0001…Qa\u000e²‘a\u0013!V[a\u0010CV[PV[`\u0000€[‚\u0010\u0015a\nQWa\u000eсa\u0013LV[’PPa\u000e݂a\tJV[\u0015a\u000eðW€a\u000eìa\u0013LV[‘PP[a\u000e¿V[```\u0001‚Q\u0011a\u000f\u0004WPV[a\u000e·‚`\u0001€…Qa\u000e²‘a\u0013!V[sq\tpžÏ©\u001a€boó˜hö[\u001dÑ-;\u0015a\u0010\u0012W`@€Qsq\tpžÏ©\u001a€boó˜hö[\u001dÑ-` ‚\u0001Re\u0019˜Z[\u0019Y`Ò\u001b’‚\u0001’’R`\u0001``‚\u0001R`\u0000‘pÊ\u0010»ÐÛý ©ô±4\u0002Ál± p^\r\u001c\nê±\u000f£S®XoĐ`€\u0001`@€Q`\u001f\u0019„\u0003\u0001R‚Ra\u000f±’‘` \u0001a\u0013ÞV[`@€Q`\u001f\u0019„\u0003\u0001R‚Ra\u000fˑa\u0014\u000fV[`\u0000`@Q€ƒ\u0003`\u0000†Zñ‘PP=€`\u0000\u0014a\u0010\u0008W`@Q‘P`\u001f\u0019`?=\u0001\u0016‚\u0001`@R=‚R=`\u0000` „\u0001>a\u0010\rV[``‘P[PPPP[`\u0000€Taÿ\u0000\u0019\u0016a\u0001\u0000\u0017UV[`\u0000a\u00101`\u0002‚a\u00138V[a\nwg\rඳ§d\u0000\u0000†a\u0013}V[€‚\u0010a\u0010OWPPPV[`\u0000…`\u0002a\u0010`……a\u0013!V[a\u0010j‘a\u00138V[a\u0010t‡a\u0013eV[Q\u0010a\u0010„Wa\u0010„a\u0013œV[` \u0002` \u0001\u0001QP[ƒ\u0011a\u0011¤W[€†„Q\u0010a\u0010ªWa\u0010ªa\u0013œV[` \u0002` \u0001\u0001Q\u0010\u0015a\u0010ÊW‚a\u0010a\u0013LV[“PPa\u0010—V[…‚Q\u0010a\u0010ÜWa\u0010Üa\u0013œV[` \u0002` \u0001\u0001Q\u0010€\u0015a\u0010òWP`\u0000‚\u0011[\u0015a\u0011\tWa\u0011\u0001a\u0015IV[’PPa\u0010ÊV[ƒ\u0011a\u0011ŸW…‚Q\u0010a\u0011\"Wa\u0011\"a\u0013œV[` \u0002` \u0001\u0001Q†„Q\u0010a\u0011=`\u0000ý[PPPP`\u0000`\u0002‚`\u0001a\u0004‘a\u0013eV[a\u0004™„a\u0013}V[a\u0004£‘a\u00138V[P`\u0000a\u0004°ƒa\u000c`V[Pa\u0003\u0014‚‚a\u000c’V[`\u0000a\u0004ǂa\rqV[P`\u0001`\u0000[ƒQ\u0010€\u0015a\u0004ÛWP[\u0015a\u0005\u0012WƒQ\u0010a\u0004òWa\u0004òa\u0013œV[` \u0002` \u0001\u0001Qƒ\u0010\u0015‘P€€a\u0005\na\u0013LV[‘PPa\u0004ÎV[Pa\u0003\u0014a\t›V[`\u0000a\u0003&`da\u0005‰V[`\u0000a\u00053‚a\rÐV[P`\u0001`\u0000[ƒQ\u0010€\u0015a\u0005GWP[\u0015a\u0005\u0012WƒQ\u0010a\u0005^Wa\u0005^a\u0013œV[` \u0002` \u0001\u0001Qƒ\u0010\u0015‘P€€a\u0005va\u0013LV[‘PPa\u0005:V[`\u0000a\u0002˃a\u000e.V[`@Qc&1ò±`á\u001bRf¸\u0017\u0002à\\\u000bo‚\u0011\u0015`\u0004‚\u0001R`\u0000sq\tpžÏ©\u001a€boó˜hö[\u001dÑ-cLcåb`$\u0001`\u0000`@Q€ƒ\u0003`\u0000‡€;\u0015€\u0015a\u0005âW`\u0000€ý[PZñ\u0015€\u0015a\u0005öW=`\u0000€>=`\u0000ý[PPPP`\u0000[‚\u0015a\u0006!Wa\u0006\rƒ‚a\u0013eV[Pa\u0006\u001a`\u0001„a\u0013!V[’Pa\u0005ýV[’‘PPV[`@Qc&1ò±`á\u001bR`d‚\u0011\u0015`\u0004‚\u0001Rsq\tpžÏ©\u001a€boó˜hö[\u001dÑ-cLcåb`$\u0001`\u0000`@Q€ƒ\u0003`\u0000‡€;\u0015€\u0015a\u0006wW`\u0000€ý[PZñ\u0015€\u0015a\u0006‹W=`\u0000€>=`\u0000ý[PPPP`\u0000`\u0002‚`\u0001a\u0006 ‘a\u0013eV[a\u0006ª„a\u0013}V[a\u0006´‘a\u00138V[P`\u0000a\u0004°ƒa\u000eeV[`\u0000a\u0006̂a\u000eV[P`\u0001€[‚Q\u0010€\u0015a\u0006ßWP[\u0015a\u0005\u0012WƒQ\u0010a\u0006öWa\u0006öa\u0013œV[` \u0002` \u0001\u0001Q„`\u0001ƒa\u0007\u000c‘a\u0013!V[Q\u0010a\u0007\u001cWa\u0007\u001ca\u0013œV[` \u0002` \u0001\u0001Q\u0011\u0015‘P€€a\u00073a\u0013LV[‘PPa\u0006ÒV[`\u0000a\u0007Fƒa\u000e»V[P‚`\u0000\u0003a\u0007[Wa\u0003\u0014`\u0000a\u000c’V[a\u0007ga\u0002݂a\tJV[`\u0000a\u0007|a\u0007w`\u0001†a\u0013!V[a\u000e»V[Pa\u0003ƒ„\u0011\u0015€a\u0007WP‚„\u0010\u0015[€a\u0002ÝWPa\u0007Ÿ„a\tJV[\u0015a\t›V[`\u0000€Ta\u0001\u0000\u0004`ÿ\u0016\u0015a\u0007ÅWP`\u0000Ta\u0001\u0000\u0004`ÿ\u0016V[`\u0000sq\tpžÏ©\u001a€boó˜hö[\u001dÑ-;\u0015a\u0008ËW`@€Qsq\tpžÏ©\u001a€boó˜hö[\u001dÑ-` ‚\u0001Re\u0019˜Z[\u0019Y`Ò\u001b‚„\u0001R‚Q€ƒ\u0003„\u0001R``ƒ\u0001“R`\u0000’‘a\u0008S‘fpÊA\u001dpêÕ\r\\\"\u0007\r¯Ãj×_=Ï^r7²*ޚìđ`€\u0001a\u0013ÞV[`@€Q`\u001f\u0019„\u0003\u0001R‚Ra\u0008m‘a\u0014\u000fV[`\u0000`@Q€ƒ\u0003`\u0000†Zñ‘PP=€`\u0000\u0014a\u0008ªW`@Q‘P`\u001f\u0019`?=\u0001\u0016‚\u0001`@R=‚R=`\u0000` „\u0001>a\u0008¯V[``‘P[P‘PP€€` \u0001Q\u0001a\u0008Ǒa\u0014+V[‘PP[‘PV[`\u0000a\u0008ۂa\u000eõV[P`\u0001€[‚Q\u0010€\u0015a\u0008îWP[\u0015a\u0005\u0012WƒQ\u0010a\t\u0005Wa\t\u0005a\u0013œV[` \u0002` \u0001\u0001Q„`\u0001ƒa\t\u001b‘a\u0013!V[Q\u0010a\t+Wa\t+a\u0013œV[` \u0002` \u0001\u0001Q\u0011\u0015‘P€€a\tBa\u0013LV[‘PPa\u0008áV[`\u0000`\u0002‚\u0010\u0015a\t]WP`\u0000‘PV[`\u0002[‚\u0010\u0015a\t’Wa\tr„a\u0012÷V[\u0015a\t€WP`\u0000’‘PPV[€a\tŠa\u0013LV[‘PPa\t`V[P`\u0001’‘PPV[€a\u0003£WA0O¬Ù2=u±\u001bÍÖ\tË8ïÿý°W\u0010÷Êðé±lmpŸP`@Qa\tÿ` €‚R`\u0017‚\u0001RError: Assertion Failed\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000`@‚\u0001R``\u0001V[`@Q€‘\u0003¡a\u0003£a\u000f\u0017V[`\u0000`\u0000\u0003a\n!WP`\u0000‘PV[[€‘P`\u0002a\n3…„a\u0010#V[a\n=‘a\u0013eV[a\nG‘a\u00138V[P\u0003a\n#W[P‘PV[`\u0000g\rඳ§d\u0000\u0000a\nm`\u0002‚a\u00138V[a\nw„†a\u0013}V[a\n‘a\u0013eV[a\n‹‘a\u00138V[“’PPPV[`\u0000`\u0002‚\u0010\u0015a\n¥WP`\u0000‘PV[`\u0002[a\n³`\u0002„a\u00138V[\u0011a\t’Wa\nÁ„a\u0012÷V[\u0015a\nÑWP`\u0000’‘PPV[€a\nہa\u0013LV[‘PPa\n¨V[€\u0015\u0015‚\u0015\u0015\u0014a\u0004\u0006WA0O¬Ù2=u±\u001bÍÖ\tË8ïÿý°W\u0010÷Êðé±lmpŸP`@Qa\u000bX` €‚R`\"‚\u0001RError: a == b not satisfied [boo`@‚\u0001Ral]`ð\u001b``‚\u0001R`€\u0001V[`@Q€‘\u0003¡(\u000fDF²Š\u0013rA}Úe0¹[)’±*ÉÇóxS_)©zÏ5ƒa\u000b©W`@Q€`@\u0001`@R€`\u0005R` \u0001dfalse`Ø\u001bRPa\u000bÇV[`@Q€`@\u0001`@R€`\u0004R` \u0001ctrue`à\u001bRP[`@Qa\u000bԑa\u0014yV[`@Q€‘\u0003¡(\u000fDF²Š\u0013rA}Úe0¹[)’±*ÉÇóxS_)©zÏ5ƒ‚a\u000c%W`@Q€`@\u0001`@R€`\u0005R` \u0001dfalse`Ø\u001bRPa\u000cCV[`@Q€`@\u0001`@R€`\u0004R` \u0001ctrue`à\u001bRP[`@Qa\u000cP‘a\u0014½V[`@Q€‘\u0003¡a\u0004\u0006a\u000f\u0017V[`\u0000€€[ƒ\u0010\u0015a\u000c‹Wa\u000cwƒa\u0013eV[‘P€a\u000cƒa\u0013LV[‘PPa\u000ceV[P’‘PPV[€‚\u0014a\u0004\u0006WA0O¬Ù2=u±\u001bÍÖ\tË8ïÿý°W\u0010÷Êðé±lmpŸP`@Qa\r\u0003` €‚R`\"‚\u0001RError: a == b not satisfied [uin`@‚\u0001Rat]`ð\u001b``‚\u0001R`€\u0001V[`@Q€‘\u0003¡²Þ/¾€\u001a\röÀËÝýD‹£Ä\u001dH @Ê5Ål–ï\u000fÊç!¨`@Qa\r:‘a\u0014çV[`@Q€‘\u0003¡²Þ/¾€\u001a\röÀËÝýD‹£Ä\u001dH @Ê5Ål–ï\u000fÊç!¨‚`@Qa\u000cP‘a\u0015\u001fV[`\u0000€`\u0001[ƒQ\u0010\u0015a\u000c‹W„‚Q\u0010a\r“Wa\r“a\u0013œV[` \u0002` \u0001\u0001Q\u0011\u0015a\r¾WƒQ\u0010a\r³Wa\r³a\u0013œV[` \u0002` \u0001\u0001Q‘P[€a\rȁa\u0013LV[‘PPa\rwV[`\u0000€€[ƒQ\u0010\u0015a\u000c‹W„‚Q\u0010a\rñWa\rña\u0013œV[` \u0002` \u0001\u0001Q\u0011\u0015a\u000e\u001cWƒQ\u0010a\u000e\u0011Wa\u000e\u0011a\u0013œV[` \u0002` \u0001\u0001Q‘P[€a\u000e&a\u0013LV[‘PPa\rÕV[`\u0000`\u0002[‚\u0010\u0015a\t’Wa\u000eE„a\u0012÷V[\u0015a\u000eSWP`\u0000’‘PPV[€a\u000e]a\u0013LV[‘PPa\u000e3V[`\u0000€€[ƒ\u0011a\u000c‹Wa\u000e{ƒa\u0013eV[‘P€a\u000e‡a\u0013LV[‘PPa\u000ejV[```\u0001‚Q\u0011a\u000ežWPV[a\u000e·‚`\u0000`\u0001…Qa\u000e²‘a\u0013!V[a\u0010CV[PV[`\u0000€[‚\u0010\u0015a\nQWa\u000eсa\u0013LV[’PPa\u000e݂a\tJV[\u0015a\u000eðW€a\u000eìa\u0013LV[‘PP[a\u000e¿V[```\u0001‚Q\u0011a\u000f\u0004WPV[a\u000e·‚`\u0001€…Qa\u000e²‘a\u0013!V[sq\tpžÏ©\u001a€boó˜hö[\u001dÑ-;\u0015a\u0010\u0012W`@€Qsq\tpžÏ©\u001a€boó˜hö[\u001dÑ-` ‚\u0001Re\u0019˜Z[\u0019Y`Ò\u001b’‚\u0001’’R`\u0001``‚\u0001R`\u0000‘pÊ\u0010»ÐÛý ©ô±4\u0002Ál± p^\r\u001c\nê±\u000f£S®XoĐ`€\u0001`@€Q`\u001f\u0019„\u0003\u0001R‚Ra\u000f±’‘` \u0001a\u0013ÞV[`@€Q`\u001f\u0019„\u0003\u0001R‚Ra\u000fˑa\u0014\u000fV[`\u0000`@Q€ƒ\u0003`\u0000†Zñ‘PP=€`\u0000\u0014a\u0010\u0008W`@Q‘P`\u001f\u0019`?=\u0001\u0016‚\u0001`@R=‚R=`\u0000` „\u0001>a\u0010\rV[``‘P[PPPP[`\u0000€Taÿ\u0000\u0019\u0016a\u0001\u0000\u0017UV[`\u0000a\u00101`\u0002‚a\u00138V[a\nwg\rඳ§d\u0000\u0000†a\u0013}V[€‚\u0010a\u0010OWPPPV[`\u0000…`\u0002a\u0010`……a\u0013!V[a\u0010j‘a\u00138V[a\u0010t‡a\u0013eV[Q\u0010a\u0010„Wa\u0010„a\u0013œV[` \u0002` \u0001\u0001QP[ƒ\u0011a\u0011¤W[€†„Q\u0010a\u0010ªWa\u0010ªa\u0013œV[` \u0002` \u0001\u0001Q\u0010\u0015a\u0010ÊW‚a\u0010a\u0013LV[“PPa\u0010—V[…‚Q\u0010a\u0010ÜWa\u0010Üa\u0013œV[` \u0002` \u0001\u0001Q\u0010€\u0015a\u0010òWP`\u0000‚\u0011[\u0015a\u0011\tWa\u0011\u0001a\u0015IV[’PPa\u0010ÊV[ƒ\u0011a\u0011ŸW…‚Q\u0010a\u0011\"Wa\u0011\"a\u0013œV[` \u0002` \u0001\u0001Q†„Q\u0010a\u0011 Date: Thu, 1 Aug 2024 20:48:24 +1000 Subject: [PATCH 3/3] restore collection test expected response (local cabal inconsistency) --- .../test-collectiontest/response-from-12.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/booster/test/rpc-integration/test-collectiontest/response-from-12.json b/booster/test/rpc-integration/test-collectiontest/response-from-12.json index 486a679472..d4107e6b74 100644 --- a/booster/test/rpc-integration/test-collectiontest/response-from-12.json +++ b/booster/test/rpc-integration/test-collectiontest/response-from-12.json @@ -93,7 +93,7 @@ "name": "SortInt", "args": [] }, - "value": "4" + "value": "6" } ] } @@ -132,7 +132,7 @@ "name": "SortInt", "args": [] }, - "value": "5" + "value": "7" } ] } @@ -171,7 +171,7 @@ "name": "SortInt", "args": [] }, - "value": "6" + "value": "4" } ] } @@ -210,7 +210,7 @@ "name": "SortInt", "args": [] }, - "value": "7" + "value": "5" } ] } @@ -249,7 +249,7 @@ "name": "SortInt", "args": [] }, - "value": "1" + "value": "2" } ] } @@ -288,7 +288,7 @@ "name": "SortInt", "args": [] }, - "value": "2" + "value": "3" } ] } @@ -327,7 +327,7 @@ "name": "SortInt", "args": [] }, - "value": "3" + "value": "1" } ] } @@ -366,7 +366,7 @@ "name": "SortInt", "args": [] }, - "value": "12" + "value": "8" } ] } @@ -405,7 +405,7 @@ "name": "SortInt", "args": [] }, - "value": "8" + "value": "9" } ] } @@ -444,7 +444,7 @@ "name": "SortInt", "args": [] }, - "value": "9" + "value": "12" } ] }