Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable transaction support in integration tests for cardano-http-bridge #258

Merged
merged 10 commits into from
May 14, 2019
Merged

Enable transaction support in integration tests for cardano-http-bridge #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a8ab2ad
add _debug_ output when restoring transactions, display all restored …
KtorZ May 13, 2019
6917f09
Improve debugging capability for unexpected network failures by provi…
KtorZ May 13, 2019
80c0345
review overall integration cluster startup delays and folders
KtorZ May 13, 2019
df02851
review local cluster configuration to 'match' testnet as closely as p…
KtorZ May 13, 2019
7216f60
write helper to extract funds from a faucet address and a first dummy…
KtorZ May 13, 2019
055e63c
add missing dependencies and modules to http-bridge dot cabal
KtorZ May 13, 2019
d923968
Add 'Ord' instance for 'WalletState'
KtorZ May 14, 2019
971a1b3
refactor temporary transaction scenario & provide a 'fixtureWallet' u…
KtorZ May 14, 2019
7a0f2a2
review WalletLayer interface implementation indentation
KtorZ May 14, 2019
55154e9
cleanup restoration workers when wallet is deleted
KtorZ May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- travis_retry curl -L -o cardano-node-simple.tar.gz https://raw.githubusercontent.com/input-output-hk/cardano-wallet/master/lib/http-bridge/test/data/cardano-node-simple/cardano-node-simple-3.0.1.tar.gz
- tar xzf cardano-node-simple.tar.gz -C $HOME/.local/bin
- cardano-node-simple --version
- test "$(cardano-http-bridge --version)" = "cardano-http-bridge 0.0.1" || travis_retry cargo install --force --branch cardano-wallet-integration --git https://github.com/KtorZ/cardano-http-bridge.git
- test "$(cardano-http-bridge --version)" = "cardano-http-bridge 0.0.2" || travis_retry cargo install --force --branch cardano-wallet-integration --git https://github.com/KtorZ/cardano-http-bridge.git
- cardano-http-bridge --version
- travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
- stack --no-terminal setup
Expand Down
4 changes: 2 additions & 2 deletions exe/wallet/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import Cardano.CLI
import Cardano.Environment.HttpBridge
( network )
import Cardano.Wallet
( mkWalletLayer )
( newWalletLayer )
import Cardano.Wallet.Api
( Api )
import Cardano.Wallet.Api.Server
Expand Down Expand Up @@ -327,7 +327,7 @@ execServer (Port port) (Port bridgePort) = do
db <- MVar.newDBLayer
nw <- HttpBridge.newNetworkLayer bridgePort
let tl = HttpBridge.newTransactionLayer
let wallet = mkWalletLayer @_ @HttpBridge db nw tl
wallet <- newWalletLayer @_ @HttpBridge db nw tl
Warp.runSettings settings (serve (Proxy @("v2" :> Api)) (server wallet))
where
settings = Warp.defaultSettings
Expand Down
Loading