Add State to ChannelViewItem struct

Author: ealymbaev

LightningWallet/Modules/Channels/ChannelCell.swift

@@ -21,7 +21,7 @@ class ChannelCell: UITableViewCell {
     }
 
     func bind(viewItem: ChannelViewItem) {
-        label.text = "Remote PubKey: \(viewItem.remotePubKey)\nLocalBalance: \(viewItem.localBalance)\nRemote Balance: \(viewItem.remoteBalance)"
+        label.text = "State: \(viewItem.state)\nRemote PubKey: \(viewItem.remotePubKey)\nLocalBalance: \(viewItem.localBalance)\nRemote Balance: \(viewItem.remoteBalance)"
     }
 
 }

LightningWallet/Modules/Channels/ChannelsInteractor.swift

@@ -26,4 +26,14 @@ extension ChannelsInteractor: IChannelsInteractor {
                 .disposed(by: disposeBag)
     }
 
+    func fetchPendingChannels() {
+        lightningKit.pendingChannelsSingle
+                .subscribeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
+                .observeOn(MainScheduler.instance)
+                .subscribe(onSuccess: { [weak self] response in
+                    self?.delegate?.didUpdatePendingChannels(response: response)
+                })
+                .disposed(by: disposeBag)
+    }
+
 }

LightningWallet/Modules/Channels/ChannelsModule.swift

@@ -18,14 +18,25 @@ protocol IChannelsViewDelegate {
 
 protocol IChannelsInteractor {
     func fetchOpenChannels()
+    func fetchPendingChannels()
 }
 
 protocol IChannelsInteractorDelegate: AnyObject {
     func didUpdate(openChannels: [Lnrpc_Channel])
+    func didUpdatePendingChannels(response: Lnrpc_PendingChannelsResponse)
 }
 
 struct ChannelViewItem {
+    let state: State
     let remotePubKey: String
     let localBalance: Int
     let remoteBalance: Int
+
+    enum State {
+        case open
+        case pendingOpen
+        case pendingClosing
+        case pendingForceClosing
+        case waitingClose
+    }
 }

LightningWallet/Modules/Channels/ChannelsPresenter.swift

@@ -6,17 +6,36 @@ class ChannelsPresenter {
     private let interactor: IChannelsInteractor
     private let router: IChannelsRouter
 
+    private var openChannels: [Lnrpc_Channel] = []
+    private var pendingOpenChannels: [Lnrpc_PendingChannelsResponse.PendingOpenChannel] = []
+    private var pendingClosingChannels: [Lnrpc_PendingChannelsResponse.ClosedChannel] = []
+    private var pendingForceClosingChannels: [Lnrpc_PendingChannelsResponse.ForceClosedChannel] = []
+    private var waitingCloseChannels: [Lnrpc_PendingChannelsResponse.WaitingCloseChannel] = []
+
     init(interactor: IChannelsInteractor, router: IChannelsRouter) {
         self.interactor = interactor
         self.router = router
     }
 
+    private func syncView() {
+        let factory = ChannelsViewItemFactory()
+
+        let openChannelViewItems = openChannels.map { factory.viewItem(channel: $0) }
+        let pendingOpenChannelViewItems = pendingOpenChannels.map { factory.viewItem(state: .pendingOpen, pendingChannel: $0.channel) }
+        let pendingClosingChannelViewItems = pendingClosingChannels.map { factory.viewItem(state: .pendingClosing, pendingChannel: $0.channel) }
+        let pendingForceClosingChannelViewItems = pendingForceClosingChannels.map { factory.viewItem(state: .pendingForceClosing, pendingChannel: $0.channel) }
+        let waitingCloseChannelViewItems = waitingCloseChannels.map { factory.viewItem(state: .waitingClose, pendingChannel: $0.channel) }
+
+        view?.show(viewItems: openChannelViewItems + pendingOpenChannelViewItems + pendingClosingChannelViewItems + pendingForceClosingChannelViewItems + waitingCloseChannelViewItems)
+    }
+
 }
 
 extension ChannelsPresenter: IChannelsViewDelegate {
 
     func onLoad() {
         interactor.fetchOpenChannels()
+        interactor.fetchPendingChannels()
     }
 
     func onClose() {
@@ -40,11 +59,16 @@ extension ChannelsPresenter: IChannelsViewDelegate {
 extension ChannelsPresenter: IChannelsInteractorDelegate {
 
     func didUpdate(openChannels: [Lnrpc_Channel]) {
-        let factory = ChannelsViewItemFactory()
-        let viewItems = openChannels.map {
-            factory.viewItem(channel: $0)
-        }
-        view?.show(viewItems: viewItems)
+        self.openChannels = openChannels
+        syncView()
+    }
+
+    func didUpdatePendingChannels(response: Lnrpc_PendingChannelsResponse) {
+        self.pendingOpenChannels = response.pendingOpenChannels
+        self.pendingClosingChannels = response.pendingClosingChannels
+        self.pendingForceClosingChannels = response.pendingForceClosingChannels
+        self.waitingCloseChannels = response.waitingCloseChannels
+        syncView()
     }
 
 }
@@ -53,10 +77,20 @@ class ChannelsViewItemFactory {
 
     func viewItem(channel: Lnrpc_Channel) -> ChannelViewItem {
         ChannelViewItem(
+                state: .open,
                 remotePubKey: channel.remotePubkey,
                 localBalance: Int(channel.localBalance),
                 remoteBalance: Int(channel.remoteBalance)
         )
     }
 
+    func viewItem(state: ChannelViewItem.State, pendingChannel: Lnrpc_PendingChannelsResponse.PendingChannel) -> ChannelViewItem {
+        ChannelViewItem(
+                state: state,
+                remotePubKey: pendingChannel.remoteNodePub,
+                localBalance: Int(pendingChannel.localBalance),
+                remoteBalance: Int(pendingChannel.remoteBalance)
+        )
+    }
+
 }