Skip to content

Commit 60917a1

Browse files
jcnelsonjcnelson
authored
Merge branch 'develop' into fix/burn-view
2 parents 94016bd + e2415d3 commit 60917a1

File tree

30 files changed

+192
-372
lines changed

30 files changed

+192
-372
lines changed

‎.github/workflows/ci.yml

Lines changed: 16 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,10 @@ jobs:
112112
## - commit to either (development, master) branch
113113
create-cache:
114114
if: |
115-
needs.check-release.outputs.is_release == 'true' || (
116-
github.event_name == 'workflow_dispatch' ||
117-
github.event_name == 'pull_request' ||
118-
github.event_name == 'merge_group' ||
119-
(
120-
contains('
121-
refs/heads/master
122-
refs/heads/develop
123-
refs/heads/next
124-
', github.event.pull_request.head.ref) &&
125-
github.event_name == 'push'
126-
)
127-
)
115+
needs.check-release.outputs.is_release == 'true' ||
116+
github.event_name == 'workflow_dispatch' ||
117+
github.event_name == 'pull_request' ||
118+
github.event_name == 'merge_group'
128119
name: Create Test Cache
129120
needs:
130121
- rustfmt
@@ -144,19 +135,9 @@ jobs:
144135
## - commit to either (development, next, master) branch
145136
stacks-core-tests:
146137
if: |
147-
needs.check-release.outputs.is_release == 'true' || (
148-
github.event_name == 'workflow_dispatch' ||
149-
github.event_name == 'pull_request' ||
150-
github.event_name == 'merge_group' ||
151-
(
152-
contains('
153-
refs/heads/master
154-
refs/heads/develop
155-
refs/heads/next
156-
', github.event.pull_request.head.ref) &&
157-
github.event_name == 'push'
158-
)
159-
)
138+
github.event_name == 'workflow_dispatch' ||
139+
github.event_name == 'pull_request' ||
140+
github.event_name == 'merge_group'
160141
name: Stacks Core Tests
161142
needs:
162143
- rustfmt
@@ -177,19 +158,9 @@ jobs:
177158
## - commit to either (development, next, master) branch
178159
stacks-core-build-tests:
179160
if: |
180-
needs.check-release.outputs.is_release == 'true' || (
181-
github.event_name == 'workflow_dispatch' ||
182-
github.event_name == 'pull_request' ||
183-
github.event_name == 'merge_group' ||
184-
(
185-
contains('
186-
refs/heads/master
187-
refs/heads/develop
188-
refs/heads/next
189-
', github.event.pull_request.head.ref) &&
190-
github.event_name == 'push'
191-
)
192-
)
161+
github.event_name == 'workflow_dispatch' ||
162+
github.event_name == 'pull_request' ||
163+
github.event_name == 'merge_group'
193164
name: Stacks Core Build Tests
194165
needs:
195166
- rustfmt
@@ -198,42 +169,21 @@ jobs:
198169

199170
bitcoin-tests:
200171
if: |
201-
needs.check-release.outputs.is_release == 'true' || (
202-
github.event_name == 'workflow_dispatch' ||
203-
github.event_name == 'pull_request' ||
204-
github.event_name == 'merge_group' ||
205-
(
206-
contains('
207-
refs/heads/master
208-
refs/heads/develop
209-
refs/heads/next
210-
', github.event.pull_request.head.ref) &&
211-
github.event_name == 'push'
212-
)
213-
)
172+
github.event_name == 'workflow_dispatch' ||
173+
github.event_name == 'pull_request' ||
174+
github.event_name == 'merge_group'
214175
name: Bitcoin Tests
215176
needs:
216177
- rustfmt
217178
- create-cache
218179
- check-release
219180
uses: ./.github/workflows/bitcoin-tests.yml
220181

221-
222182
p2p-tests:
223183
if: |
224-
needs.check-release.outputs.is_release == 'true' || (
225-
github.event_name == 'workflow_dispatch' ||
226-
github.event_name == 'pull_request' ||
227-
github.event_name == 'merge_group' ||
228-
(
229-
contains('
230-
refs/heads/master
231-
refs/heads/develop
232-
refs/heads/next
233-
', github.event.pull_request.head.ref) &&
234-
github.event_name == 'push'
235-
)
236-
)
184+
github.event_name == 'workflow_dispatch' ||
185+
github.event_name == 'pull_request' ||
186+
github.event_name == 'merge_group'
237187
name: P2P Tests
238188
needs:
239189
- rustfmt

‎.github/workflows/docs-pr.yml

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎stackslib/src/burnchains/tests/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ fn mine_10_stacks_blocks_1_fork() {
969969
);
970970

971971
verify_keys_accepted(&mut node, &prev_keys);
972-
verify_commits_accepted(&mut node, &next_block_commits);
972+
verify_commits_accepted(&node, &next_block_commits);
973973

974974
prev_keys.clear();
975975
prev_keys.append(&mut next_prev_keys);
@@ -1017,7 +1017,7 @@ fn mine_10_stacks_blocks_2_forks_disjoint() {
10171017
);
10181018

10191019
verify_keys_accepted(&mut node, &prev_keys_1);
1020-
verify_commits_accepted(&mut node, &next_block_commits);
1020+
verify_commits_accepted(&node, &next_block_commits);
10211021

10221022
prev_keys_1.clear();
10231023
prev_keys_1.append(&mut next_prev_keys);
@@ -1078,10 +1078,10 @@ fn mine_10_stacks_blocks_2_forks_disjoint() {
10781078
assert!(next_snapshot_1.burn_header_hash != next_snapshot_2.burn_header_hash);
10791079

10801080
verify_keys_accepted(&mut node, &prev_keys_1);
1081-
verify_commits_accepted(&mut node, &next_block_commits_1);
1081+
verify_commits_accepted(&node, &next_block_commits_1);
10821082

10831083
verify_keys_accepted(&mut node, &prev_keys_2);
1084-
verify_commits_accepted(&mut node, &next_block_commits_2);
1084+
verify_commits_accepted(&node, &next_block_commits_2);
10851085

10861086
prev_keys_1.clear();
10871087
prev_keys_1.append(&mut next_prev_keys_1);
@@ -1132,7 +1132,7 @@ fn mine_10_stacks_blocks_2_forks_disjoint_same_blocks() {
11321132
);
11331133

11341134
verify_keys_accepted(&mut node, &prev_keys_1);
1135-
verify_commits_accepted(&mut node, &next_block_commits);
1135+
verify_commits_accepted(&node, &next_block_commits);
11361136

11371137
prev_keys_1.clear();
11381138
prev_keys_1.append(&mut next_prev_keys);
@@ -1205,10 +1205,10 @@ fn mine_10_stacks_blocks_2_forks_disjoint_same_blocks() {
12051205
}
12061206

12071207
verify_keys_accepted(&mut node, &prev_keys_1);
1208-
verify_commits_accepted(&mut node, &next_block_commits_1);
1208+
verify_commits_accepted(&node, &next_block_commits_1);
12091209

12101210
verify_keys_accepted(&mut node, &prev_keys_2);
1211-
verify_commits_accepted(&mut node, &next_block_commits_2);
1211+
verify_commits_accepted(&node, &next_block_commits_2);
12121212

12131213
prev_keys_1.clear();
12141214
prev_keys_1.append(&mut next_prev_keys_1);

‎stackslib/src/chainstate/burn/db/sortdb.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8869,7 +8869,7 @@ pub mod tests {
88698869
.get_stacks_header_hashes(
88708870
256,
88718871
&canonical_tip.consensus_hash,
8872-
&mut BlockHeaderCache::new(),
8872+
&BlockHeaderCache::new(),
88738873
)
88748874
.unwrap();
88758875
SortitionDB::merge_block_header_cache(&mut cache, &hashes);
@@ -8911,7 +8911,7 @@ pub mod tests {
89118911
.get_stacks_header_hashes(
89128912
192,
89138913
&canonical_tip.consensus_hash,
8914-
&mut BlockHeaderCache::new(),
8914+
&BlockHeaderCache::new(),
89158915
)
89168916
.unwrap();
89178917
SortitionDB::merge_block_header_cache(&mut cache, &hashes);
@@ -8951,7 +8951,7 @@ pub mod tests {
89518951
.get_stacks_header_hashes(
89528952
257,
89538953
&canonical_tip.consensus_hash,
8954-
&mut BlockHeaderCache::new(),
8954+
&BlockHeaderCache::new(),
89558955
)
89568956
.unwrap();
89578957
SortitionDB::merge_block_header_cache(&mut cache, &hashes);

‎stackslib/src/chainstate/coordinator/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ pub fn get_reward_cycle_info<U: RewardSetProvider>(
864864

865865
let mut tx = sort_db.tx_begin()?;
866866
let preprocessed_reward_set =
867-
SortitionDB::get_preprocessed_reward_set(&mut tx, &first_prepare_sn.sortition_id)?;
867+
SortitionDB::get_preprocessed_reward_set(&tx, &first_prepare_sn.sortition_id)?;
868868

869869
// It's possible that we haven't processed the PoX anchor block at the time we have
870870
// processed the burnchain block which commits to it. In this case, the PoX anchor block
@@ -2308,9 +2308,9 @@ impl<
23082308
canonical_snapshot.canonical_stacks_tip_height,
23092309
);
23102310

2311-
let mut tx = self.sortition_db.tx_begin()?;
2311+
let tx = self.sortition_db.tx_begin()?;
23122312
SortitionDB::revalidate_snapshot_with_block(
2313-
&mut tx,
2313+
&tx,
23142314
&new_sortition_id,
23152315
&canonical_snapshot.canonical_stacks_tip_consensus_hash,
23162316
&canonical_snapshot.canonical_stacks_tip_hash,

‎stackslib/src/chainstate/stacks/boot/contract_tests.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2523,8 +2523,7 @@ fn test_vote_withdrawal() {
25232523
"vote-proposal",
25242524
&symbols_from_values(vec![Value::UInt(0), Value::UInt(10)]),
25252525
)
2526-
.unwrap()
2527-
.0;
2526+
.unwrap();
25282527

25292528
// Assert that the number of votes is correct
25302529
assert_eq!(
@@ -2550,8 +2549,7 @@ fn test_vote_withdrawal() {
25502549
"vote-proposal",
25512550
&symbols_from_values(vec![Value::UInt(0), Value::UInt(5)]),
25522551
)
2553-
.unwrap()
2554-
.0;
2552+
.unwrap();
25552553

25562554
// Assert that the number of votes is correct
25572555
assert_eq!(
@@ -2752,8 +2750,7 @@ fn test_vote_fail() {
27522750
"vote-proposal",
27532751
&symbols_from_values(vec![Value::UInt(0), Value::UInt(USTX_PER_HOLDER)]),
27542752
)
2755-
.unwrap()
2756-
.0;
2753+
.unwrap();
27572754
}
27582755

27592756
// Assert confirmation returns true
@@ -2952,8 +2949,7 @@ fn test_vote_confirm() {
29522949
"vote-proposal",
29532950
&symbols_from_values(vec![Value::UInt(0), Value::UInt(USTX_PER_HOLDER)]),
29542951
)
2955-
.unwrap()
2956-
.0;
2952+
.unwrap();
29572953
}
29582954

29592955
// Assert confirmation returns true
@@ -3091,8 +3087,7 @@ fn test_vote_too_many_confirms() {
30913087
"withdraw-votes",
30923088
&symbols_from_values(vec![Value::UInt(i), Value::UInt(USTX_PER_HOLDER)]),
30933089
)
3094-
.unwrap()
3095-
.0;
3090+
.unwrap();
30963091
}
30973092
}
30983093
});

‎stackslib/src/chainstate/stacks/db/accounts.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ impl FromRow<MinerPaymentSchedule> for MinerPaymentSchedule {
7979
let stacks_block_height = u64::from_column(row, "stacks_block_height")?;
8080
let vtxindex: u32 = row.get_unwrap("vtxindex");
8181

82-
let schedule_type: HeaderTypeNames = row
83-
.get("schedule_type")
84-
.unwrap_or_else(|_e| HeaderTypeNames::Epoch2);
82+
let schedule_type: HeaderTypeNames =
83+
row.get("schedule_type").unwrap_or(HeaderTypeNames::Epoch2);
8584

8685
let coinbase = coinbase_text
8786
.parse::<u128>()

0 commit comments

Comments
 (0)