]> git.bitcoin.ninja Git - ldk-c-bindings/log
ldk-c-bindings
3 years agoSwap default-cpu for sandybridge and use it when compiling libsecp
Matt Corallo [Wed, 9 Jun 2021 19:15:11 +0000 (19:15 +0000)]
Swap default-cpu for sandybridge and use it when compiling libsecp

sandybridge is a reasonable choice because it supports AVX but is
also 10+ years old (with AMD support for AVX at similar times).

The next option would be haswell with AVX2, which doesn't add as
much and for which AMD processors only came about in mid-2015.

3 years agoMerge pull request #27 from TheBlueMatt/main
Matt Corallo [Tue, 8 Jun 2021 18:17:35 +0000 (18:17 +0000)]
Merge pull request #27 from TheBlueMatt/main

Fix race in C++ demo where num_txs_broadcasted ++s before =0s

3 years agoFix race in C++ demo where num_txs_broadcasted ++s before =0s
Matt Corallo [Tue, 8 Jun 2021 18:01:37 +0000 (18:01 +0000)]
Fix race in C++ demo where num_txs_broadcasted ++s before =0s

3 years agoMerge pull request #26 from TheBlueMatt/main
Matt Corallo [Tue, 8 Jun 2021 17:14:40 +0000 (17:14 +0000)]
Merge pull request #26 from TheBlueMatt/main

Update rust-secp patch to match latest version and bump upstream

3 years agoRegenerate auto-generated bindings
Matt Corallo [Tue, 8 Jun 2021 02:00:06 +0000 (02:00 +0000)]
Regenerate auto-generated bindings

3 years agoUpdate RL git hash to latest upstream (hopefully next release)
Matt Corallo [Tue, 8 Jun 2021 02:29:50 +0000 (02:29 +0000)]
Update RL git hash to latest upstream (hopefully next release)

3 years agoUpdate rust-secp patch to match latest version
Matt Corallo [Tue, 8 Jun 2021 01:50:43 +0000 (01:50 +0000)]
Update rust-secp patch to match latest version

3 years agoMerge pull request #25 from TheBlueMatt/2021-04-bp-inclusion
Matt Corallo [Sat, 5 Jun 2021 16:40:47 +0000 (16:40 +0000)]
Merge pull request #25 from TheBlueMatt/2021-04-bp-inclusion

Add background-processor to the with-std bindings

3 years agoRegenerate auto-generated bindings 2021-04-bp-inclusion
Matt Corallo [Wed, 2 Jun 2021 16:27:29 +0000 (16:27 +0000)]
Regenerate auto-generated bindings

3 years agoAdd background-processor to the with-std bindings
Matt Corallo [Tue, 1 Jun 2021 14:45:09 +0000 (14:45 +0000)]
Add background-processor to the with-std bindings

3 years agoTake advantage of clone in more manually-defined c_types structs
Matt Corallo [Wed, 2 Jun 2021 16:23:24 +0000 (16:23 +0000)]
Take advantage of clone in more manually-defined c_types structs

3 years agoImplement Clone for a few additional manually-defined c_types
Matt Corallo [Wed, 2 Jun 2021 16:22:54 +0000 (16:22 +0000)]
Implement Clone for a few additional manually-defined c_types

3 years agoImplement conversion of std::io::Error to Rust
Matt Corallo [Wed, 14 Apr 2021 02:58:32 +0000 (22:58 -0400)]
Implement conversion of std::io::Error to Rust

3 years agoImpl Send+Sync for every trait, not just those with it explicit
Matt Corallo [Wed, 14 Apr 2021 02:58:12 +0000 (22:58 -0400)]
Impl Send+Sync for every trait, not just those with it explicit

Because Send+Sync are generated by the compiler for us, we don't
really know when we should or should not generate it. That said,
Send+Sync aren't exposed outside of Rust, so it only impacts
whether we can use a type when passed to Rust, not how users will
ultimately interact with types.

3 years agoHandle concrete Deref<Target=X> bounds in generic args
Matt Corallo [Tue, 13 Apr 2021 23:27:22 +0000 (19:27 -0400)]
Handle concrete Deref<Target=X> bounds in generic args

3 years agoMerge pull request #24 from TheBlueMatt/main
Matt Corallo [Wed, 2 Jun 2021 03:50:57 +0000 (03:50 +0000)]
Merge pull request #24 from TheBlueMatt/main

Update Bindings for latest Upstream LDK

3 years agoUpdate auto-generated bindings
Matt Corallo [Tue, 1 Jun 2021 22:12:54 +0000 (22:12 +0000)]
Update auto-generated bindings

3 years agoBump git depedency to latest upstream
Matt Corallo [Mon, 10 May 2021 18:44:19 +0000 (18:44 +0000)]
Bump git depedency to latest upstream

3 years agoUpdate auto-generated bindings to match latest upstream
Matt Corallo [Mon, 10 May 2021 18:40:57 +0000 (18:40 +0000)]
Update auto-generated bindings to match latest upstream

3 years agoUpdate bindings demo clients to the new event handling API
Matt Corallo [Sun, 30 May 2021 16:53:14 +0000 (16:53 +0000)]
Update bindings demo clients to the new event handling API

3 years agoUpdate bindings demo to use invoices and the new inbound payment API
Matt Corallo [Mon, 10 May 2021 17:10:17 +0000 (17:10 +0000)]
Update bindings demo to use invoices and the new inbound payment API

3 years agoCreate mappings for std::hasher::Hash and std::cmp::Eq
Matt Corallo [Fri, 14 May 2021 17:00:10 +0000 (17:00 +0000)]
Create mappings for std::hasher::Hash and std::cmp::Eq

3 years agoAdd an export tag to indicate users cannot implement a given trait
Matt Corallo [Sun, 30 May 2021 16:17:25 +0000 (16:17 +0000)]
Add an export tag to indicate users cannot implement a given trait

Specifically, for the LDK `EventsProvider` trait, we can't
(trivially) implement the `process_pending_events` function,
defined as:
`fn process_pending_events<H: Deref>(&self, handler: H) where H::Target: EventHandler;`

We currently do not support implementing generic methods, as we'd
need to wrap them in a generic Rust-trait-to-C-trait conversion
utility, which we do not currently have. Thus, because users
almost certainly have no reason to implement the `EventsProvider`
themselves, its simpler to simply prevent the use of the C trait
struct as the Rust trait.

Concretely, this means just skipping the
`impl rustEventsProvider for CEventsProvider` block, which works
fine as no Rust functions take an `EventsProvider` as an argument.

3 years agoHandle core:: and alloc::paths instead of just std:: (or prelude)
Matt Corallo [Sun, 30 May 2021 15:44:12 +0000 (15:44 +0000)]
Handle core:: and alloc::paths instead of just std:: (or prelude)

3 years agoMerge pull request #23 from TheBlueMatt/main
Matt Corallo [Mon, 3 May 2021 20:32:56 +0000 (20:32 +0000)]
Merge pull request #23 from TheBlueMatt/main

Fix handling of returning Option<&Object> from Rust functions

3 years agoRebuild auto-generated bindings
Matt Corallo [Mon, 3 May 2021 18:14:53 +0000 (18:14 +0000)]
Rebuild auto-generated bindings

3 years agoFix handling of returning Option<&Object> from Rust functions
Matt Corallo [Mon, 3 May 2021 17:52:43 +0000 (17:52 +0000)]
Fix handling of returning Option<&Object> from Rust functions

Specifically, these were previously mapped by calling
`<object.as_ref().unwrap() as *const _>`, taking a pointer to the
option on stack instead of a pointer to the option itself.

We just need to drop the `as_ref()` to make it correct.

3 years agoMerge pull request #22 from TheBlueMatt/main
Matt Corallo [Mon, 3 May 2021 17:55:04 +0000 (17:55 +0000)]
Merge pull request #22 from TheBlueMatt/main

Redo wasm bindings

3 years agoFix double-free of String bytes after converting an owned Str.
Matt Corallo [Mon, 3 May 2021 16:33:05 +0000 (16:33 +0000)]
Fix double-free of String bytes after converting an owned Str.

3 years agoRedo wasm bindings
Matt Corallo [Mon, 3 May 2021 14:58:06 +0000 (14:58 +0000)]
Redo wasm bindings

3 years agoMerge pull request #20 from TheBlueMatt/main
Matt Corallo [Mon, 3 May 2021 13:18:57 +0000 (13:18 +0000)]
Merge pull request #20 from TheBlueMatt/main

3 years agoUpdate CI to work around missing version.rs
Matt Corallo [Sun, 2 May 2021 22:36:34 +0000 (22:36 +0000)]
Update CI to work around missing version.rs

3 years agoUpdate auto-generated bindings (without new version files)
Matt Corallo [Sun, 2 May 2021 19:49:21 +0000 (19:49 +0000)]
Update auto-generated bindings (without new version files)

3 years agoAdd ability to get the LDK and LDK-C-Bindings version
Matt Corallo [Sun, 2 May 2021 18:37:45 +0000 (18:37 +0000)]
Add ability to get the LDK and LDK-C-Bindings version

3 years agoFix no-std+WASM builds by not mixing -flto and -fembed-bitcode
Matt Corallo [Sat, 1 May 2021 04:10:24 +0000 (04:10 +0000)]
Fix no-std+WASM builds by not mixing -flto and -fembed-bitcode

3 years agoMerge pull request #19 from TheBlueMatt/2021-04-invoice-incl
Matt Corallo [Sat, 1 May 2021 02:02:41 +0000 (02:02 +0000)]
Merge pull request #19 from TheBlueMatt/2021-04-invoice-incl

3 years agoBump git hashes to latest upstream 2021-04-invoice-incl
Matt Corallo [Fri, 30 Apr 2021 20:56:28 +0000 (20:56 +0000)]
Bump git hashes to latest upstream

3 years agoUpdate auto-generated bindings with new upstream invoice creation
Matt Corallo [Fri, 30 Apr 2021 01:17:42 +0000 (01:17 +0000)]
Update auto-generated bindings with new upstream invoice creation

3 years agoMap enum tuple variants with no contents as unitary enum variants
Matt Corallo [Fri, 30 Apr 2021 23:41:18 +0000 (23:41 +0000)]
Map enum tuple variants with no contents as unitary enum variants

cbindgen maps `enum A { V() }` with a `struct A_V_Body {}` which
has different size on C and C++ (0 and 1 bytes). While this is
fine if a different variant has non-0 size as the union will be
correctly sized. However, there isn't a lot of reason to rely on
this when we can just have a unitary variant as well.

3 years agoResolve issues with Str introduced when it became ownable
Matt Corallo [Fri, 30 Apr 2021 23:09:05 +0000 (23:09 +0000)]
Resolve issues with Str introduced when it became ownable

When converting from a Str to an &str, we previously took ownership
of the Str, copied the pointer to its characters to an &str and
returned the &str. This made the returned bytes always unreadable.

Further, there is now no reason to use Vec_u8Z for owned Strs, so
we swap for Str as well.

3 years agoResolve generic params with default (eg `<A=B(>) as their default.
Matt Corallo [Fri, 30 Apr 2021 18:35:58 +0000 (18:35 +0000)]
Resolve generic params with default (eg `<A=B(>) as their default.

3 years agoDrop stale () -> u8 mapping (now) used in Rust-only code
Matt Corallo [Fri, 30 Apr 2021 23:40:51 +0000 (23:40 +0000)]
Drop stale () -> u8 mapping (now) used in Rust-only code

3 years agoHandle generics on enums
Matt Corallo [Fri, 30 Apr 2021 16:19:51 +0000 (16:19 +0000)]
Handle generics on enums

3 years agoTake parameters to trait functions as mut
Matt Corallo [Thu, 29 Apr 2021 22:49:40 +0000 (22:49 +0000)]
Take parameters to trait functions as mut

In keeping with "generally, make all variables mut so that
converters can assume inputs are mut", we should do the same for
trait implementation blocks.

3 years agoSupport secp256k1 RecoverableSignatures
Matt Corallo [Thu, 29 Apr 2021 22:29:36 +0000 (22:29 +0000)]
Support secp256k1 RecoverableSignatures

3 years agoDrop debug print that slipped into git
Matt Corallo [Thu, 29 Apr 2021 22:18:52 +0000 (22:18 +0000)]
Drop debug print that slipped into git

3 years agoUpdate module paths for hash wrappers
Matt Corallo [Thu, 29 Apr 2021 15:21:35 +0000 (15:21 +0000)]
Update module paths for hash wrappers

3 years agoCorrect handling of Display trait conversion
Matt Corallo [Fri, 30 Apr 2021 04:33:10 +0000 (04:33 +0000)]
Correct handling of Display trait conversion

Previously we were incorrectly taking the *Rust* objects as
parameters in C functions instead of the C-mapped ones.

3 years agoMerge pull request #18 from TheBlueMatt/2021-04-invoice-incl
Matt Corallo [Thu, 29 Apr 2021 21:55:48 +0000 (21:55 +0000)]
Merge pull request #18 from TheBlueMatt/2021-04-invoice-incl

Bump to latest upstream and include lightning-invoice bindings

3 years agoUpdate auto-generated bindings with lightning-invoice
Matt Corallo [Thu, 29 Apr 2021 18:58:26 +0000 (18:58 +0000)]
Update auto-generated bindings with lightning-invoice

3 years agoSimplify crates in genbindings, add invoice, and bump upstream git
Matt Corallo [Sun, 18 Apr 2021 03:09:12 +0000 (03:09 +0000)]
Simplify crates in genbindings, add invoice, and bump upstream git

3 years agoHandle std::time::SystemTime as a manually-converted object
Matt Corallo [Thu, 29 Apr 2021 15:21:04 +0000 (15:21 +0000)]
Handle std::time::SystemTime as a manually-converted object

3 years agoUpdate C++ bindings demo to support new payment secret/hash API
Matt Corallo [Wed, 28 Apr 2021 01:53:08 +0000 (01:53 +0000)]
Update C++ bindings demo to support new payment secret/hash API

3 years agoAllow missing_docs again as lightning-invoice uses it for enums
Matt Corallo [Thu, 29 Apr 2021 15:23:13 +0000 (15:23 +0000)]
Allow missing_docs again as lightning-invoice uses it for enums

3 years agoSupport super:: in use block resolution
Matt Corallo [Mon, 19 Apr 2021 21:18:24 +0000 (17:18 -0400)]
Support super:: in use block resolution

3 years agoSupport FromStr and Display impls, even if impl'd in a priv module
Matt Corallo [Mon, 19 Apr 2021 21:17:41 +0000 (17:17 -0400)]
Support FromStr and Display impls, even if impl'd in a priv module

3 years agoSupport Self in generics in some cases (eg Result<Self, E> in an impl block)
Matt Corallo [Sun, 18 Apr 2021 20:23:50 +0000 (20:23 +0000)]
Support Self in generics in some cases (eg Result<Self, E> in an impl block)

3 years agoSupport taking an owned Self in function exports
Matt Corallo [Sun, 18 Apr 2021 18:10:39 +0000 (18:10 +0000)]
Support taking an owned Self in function exports

3 years agoAdd a u5 type and a [u8; 20]
Matt Corallo [Sun, 18 Apr 2021 03:08:22 +0000 (03:08 +0000)]
Add a u5 type and a [u8; 20]

3 years agoHandle additional type aliases for secp256k1 types
Matt Corallo [Sun, 18 Apr 2021 03:07:53 +0000 (03:07 +0000)]
Handle additional type aliases for secp256k1 types

3 years agoCorrectly handle methods on an enum that take self
Matt Corallo [Sun, 18 Apr 2021 03:06:01 +0000 (03:06 +0000)]
Correctly handle methods on an enum that take self

3 years agoHandle `Vec<&Thing>` conversion to C.
Matt Corallo [Sun, 18 Apr 2021 00:44:55 +0000 (00:44 +0000)]
Handle `Vec<&Thing>` conversion to C.

3 years agoHandle type resolution of `crate::thing` without a `use crate`
Matt Corallo [Sun, 18 Apr 2021 00:43:21 +0000 (00:43 +0000)]
Handle type resolution of `crate::thing` without a `use crate`

3 years agoMerge pull request #17 from TheBlueMatt/2021-04-upstream-confirm
Matt Corallo [Mon, 26 Apr 2021 17:25:15 +0000 (17:25 +0000)]
Merge pull request #17 from TheBlueMatt/2021-04-upstream-confirm

Bump upstream to handle the Confirm trait

3 years agoEnsure array lengthgs are Int literals 2021-04-upstream-confirm
Matt Corallo [Mon, 26 Apr 2021 16:59:43 +0000 (16:59 +0000)]
Ensure array lengthgs are Int literals

This fixes a bug where an array will be converted to
[u8; StringLiteral] which results in us deciding we don't know how
to map it.

Fixes: dec732cefbdd97585b7de7fd4a9521f44f1580dd
3 years agoFix build with old/OSX clang, fixes #15
Matt Corallo [Mon, 26 Apr 2021 16:39:26 +0000 (16:39 +0000)]
Fix build with old/OSX clang, fixes #15

3 years agoUpdate git hash to latest upstream
Matt Corallo [Mon, 26 Apr 2021 15:50:46 +0000 (15:50 +0000)]
Update git hash to latest upstream

3 years agoUpdate auto-generated bindings to latest upstream
Matt Corallo [Mon, 26 Apr 2021 15:49:44 +0000 (15:49 +0000)]
Update auto-generated bindings to latest upstream

3 years agoDrop redundant deref in vec iteration
Matt Corallo [Mon, 26 Apr 2021 15:42:09 +0000 (15:42 +0000)]
Drop redundant deref in vec iteration

3 years agoHandle tuple-in-slice conversions both to *and* from C
Matt Corallo [Mon, 26 Apr 2021 15:41:48 +0000 (15:41 +0000)]
Handle tuple-in-slice conversions both to *and* from C

3 years agoHandle transaction conversion directly instead of via a new var
Matt Corallo [Sun, 25 Apr 2021 22:30:07 +0000 (22:30 +0000)]
Handle transaction conversion directly instead of via a new var

new var conversion isn't supported everywhere, and there's really
no reason transaction conversion should need it.

3 years agoSomewhat more consistently map references to C
Matt Corallo [Mon, 26 Apr 2021 15:48:06 +0000 (15:48 +0000)]
Somewhat more consistently map references to C

Instead of assuming that in some cases references are
pre-dereferenced before the to-C prefix and suffix conversions, we
no longer do that.

This matches other cases and is simply more consistent, apparently
fixing an old oversight in early generation code.

3 years agoMerge pull request #16 from afilini/cleanup
Matt Corallo [Mon, 26 Apr 2021 16:01:51 +0000 (16:01 +0000)]
Merge pull request #16 from afilini/cleanup

Minor cleanup/refactoring

3 years agoReplace more manually-built `syn::Path` with `parse_quote!()`
Alekos Filini [Mon, 26 Apr 2021 12:20:47 +0000 (14:20 +0200)]
Replace more manually-built `syn::Path` with `parse_quote!()`

3 years agoUse `quote::format_ident!()` to make new `syn::Ident`
Alekos Filini [Mon, 26 Apr 2021 11:10:49 +0000 (13:10 +0200)]
Use `quote::format_ident!()` to make new `syn::Ident`

3 years agoUse `parse_quote!()` to build complex syn::* objects
Alekos Filini [Mon, 26 Apr 2021 10:01:09 +0000 (12:01 +0200)]
Use `parse_quote!()` to build complex syn::* objects

3 years agoRemove unused import
Alekos Filini [Thu, 22 Apr 2021 10:27:52 +0000 (12:27 +0200)]
Remove unused import

3 years agoAdd .gitignore to ./c-bindings-gen
Alekos Filini [Thu, 22 Apr 2021 10:25:44 +0000 (12:25 +0200)]
Add .gitignore to ./c-bindings-gen

3 years agoMerge pull request #14 from TheBlueMatt/main
Matt Corallo [Thu, 22 Apr 2021 15:27:11 +0000 (15:27 +0000)]
Merge pull request #14 from TheBlueMatt/main

Update to latest upstream

3 years agoFix LTO with secp256k1's C code.
Matt Corallo [Thu, 22 Apr 2021 02:36:30 +0000 (02:36 +0000)]
Fix LTO with secp256k1's C code.

3 years agoOnly (attempt to) build for wasm32 when we're building nostd
Matt Corallo [Thu, 22 Apr 2021 02:33:35 +0000 (02:33 +0000)]
Only (attempt to) build for wasm32 when we're building nostd

3 years agoImprove c-bindings-gen compile time somewhat
Matt Corallo [Thu, 22 Apr 2021 02:33:31 +0000 (02:33 +0000)]
Improve c-bindings-gen compile time somewhat

3 years agoUpdate git hash for latest upstream
Matt Corallo [Wed, 21 Apr 2021 22:35:48 +0000 (22:35 +0000)]
Update git hash for latest upstream

3 years agoUpdate auto-generated bindings to latest upstream
Matt Corallo [Wed, 21 Apr 2021 22:32:11 +0000 (22:32 +0000)]
Update auto-generated bindings to latest upstream

3 years agoUpdate C++ bindings demo to new upstream API
Matt Corallo [Wed, 21 Apr 2021 22:31:54 +0000 (22:31 +0000)]
Update C++ bindings demo to new upstream API

3 years agoHandle alternate import paths for secp Public and SecretKey
Matt Corallo [Wed, 21 Apr 2021 22:31:23 +0000 (22:31 +0000)]
Handle alternate import paths for secp Public and SecretKey

3 years agoClean up cbindgen.toml to drop probably-stale-by-now info and options
Matt Corallo [Fri, 16 Apr 2021 02:29:11 +0000 (02:29 +0000)]
Clean up cbindgen.toml to drop probably-stale-by-now info and options

3 years agoMerge pull request #12 from TheBlueMatt/2021-04-incl-persister
Matt Corallo [Fri, 16 Apr 2021 01:00:23 +0000 (01:00 +0000)]
Merge pull request #12 from TheBlueMatt/2021-04-incl-persister

Include lightning-persister in generated bindings

3 years agoMerge pull request #13 from TheBlueMatt/2021-04-bump-upstream
Matt Corallo [Fri, 16 Apr 2021 00:39:14 +0000 (00:39 +0000)]
Merge pull request #13 from TheBlueMatt/2021-04-bump-upstream

Bump to latest upstream

3 years agoRegenerate auto-generated bindings with lightning-persister 2021-04-incl-persister
Matt Corallo [Tue, 13 Apr 2021 00:28:37 +0000 (20:28 -0400)]
Regenerate auto-generated bindings with lightning-persister

3 years agoHandle std::io::IOError and include lightning-persister in bindings
Matt Corallo [Sun, 11 Apr 2021 22:33:42 +0000 (18:33 -0400)]
Handle std::io::IOError and include lightning-persister in bindings

3 years agoIgnore `Sized` bounds when processing generics
Matt Corallo [Mon, 12 Apr 2021 22:26:28 +0000 (18:26 -0400)]
Ignore `Sized` bounds when processing generics

3 years agoUpdate auto-generated bindings with new module structure
Matt Corallo [Thu, 15 Apr 2021 17:20:09 +0000 (13:20 -0400)]
Update auto-generated bindings with new module structure

3 years agoUpdate manual c-bindings types for new bindings module structure
Matt Corallo [Mon, 12 Apr 2021 21:31:44 +0000 (17:31 -0400)]
Update manual c-bindings types for new bindings module structure

3 years agoDont pass original crate name in generator CLI (as there are multiple)
Matt Corallo [Mon, 12 Apr 2021 17:59:20 +0000 (13:59 -0400)]
Dont pass original crate name in generator CLI (as there are multiple)

3 years agoMove top-level crate inside a pub module in prep for multi-crate bindings
Matt Corallo [Mon, 12 Apr 2021 21:37:55 +0000 (17:37 -0400)]
Move top-level crate inside a pub module in prep for multi-crate bindings

This wraps the lightning crate inside a `pub mod lightning` wrapper
in genbindings.sh, and modifies the binding generator to handle it.

It ends up removing some code in the main TypeResolver, at the cost
of some extra handling of imports in the ImportResolver, which
focuses the amount of code that needs to be aware of the top-level
crate name down to a much smaller area. This preps us for creating
bindings for multiple crates at once.

3 years agoUpdate auto-generated bindings to latest upstream 2021-04-bump-upstream
Matt Corallo [Tue, 13 Apr 2021 18:27:07 +0000 (14:27 -0400)]
Update auto-generated bindings to latest upstream

3 years agoUpdate demo to latest upstream bindings
Matt Corallo [Thu, 15 Apr 2021 17:17:30 +0000 (13:17 -0400)]
Update demo to latest upstream bindings

3 years agoSupport concretizing generics in template parameters
Matt Corallo [Thu, 15 Apr 2021 17:11:04 +0000 (13:11 -0400)]
Support concretizing generics in template parameters

3 years agoHandle type aliases which are used in the same file as declared.
Matt Corallo [Thu, 15 Apr 2021 17:10:22 +0000 (13:10 -0400)]
Handle type aliases which are used in the same file as declared.

We previously only handled type aliases correctly when they were
declared in a different file and imported.